roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-reader: refactor: move def on_expr() to define_xs subtype

Browse source
This commit is contained in:
Roland Conybeare 2024-08-07 16:28:39 -04:00
commit c4b58bb298
6 changed files with 145 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

52
include/xo/reader/define_xs.hpp Normal file
View file

@ -0,0 +1,52 @@
/** @file define_xs.hpp
*
* Author: Roland Conybeare
**/
#pragma once
#include "exprstate.hpp"
//#include <cstdint>
namespace xo {
namespace scm {
/** @class define_xs
* @brief state to provide parsing of a define-expression
**/
class define_xs : public exprstate {
public:
define_xs(rp<DefineExprAccess> def_expr);
virtual ~define_xs() = default;
static std::unique_ptr<define_xs> def_0(rp<DefineExprAccess> def_expr);
virtual void on_expr(ref::brw<Expression> expr,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr) override;
private:
/**
* def foo : f64 = 1 ;
* ^ ^ ^ ^ ^ ^ ^ ^
* | | | | | | | (done)
* | | | | | | def_4:expect_rhs_expression:expr_progress
* | | | | | def_4:expect_rhs_expression
* | | | | def_3
* | | | def_2:expect_type
* | | def_1
* | def_0:expect_symbol
* expect_toplevel_expression_sequence
*
* def_0:expect_symbol: got 'def' keyword, symbol to follow
* def_1: got symbol name
* def_2:expect_symbol got (optional) colon, type name to follow
* def_3: got symbol type
* def_4:expect_rhs_expression got (optional) equal sign, value to follow
* (done): definition complete, pop exprstate from stack
*
**/
};
} /*namespace scm*/
} /*namespace xo*/
/** end define_xs.hpp **/

24
include/xo/reader/exprstate.hpp
View file

@ -99,9 +99,6 @@ namespace xo {
static std::unique_ptr<exprstate> make_expr_progress(rp<Expression> expr) {
return std::make_unique<exprstate>(exprstate(exprstatetype::expr_progress, expr, nullptr));
}
static std::unique_ptr<exprstate> def_0(rp<DefineExprAccess> def_expr) {
return std::make_unique<exprstate>(exprstate(exprstatetype::def_0, nullptr, def_expr));
}
static std::unique_ptr<exprstate> lparen_0() {
return std::make_unique<exprstate>(exprstate(exprstatetype::lparen_0, nullptr, nullptr));
}
@ -164,26 +161,6 @@ namespace xo {
rp<Expression> * p_emit_expr);
protected:
/**
* def foo : f64 = 1 ;
* ^ ^ ^ ^ ^ ^ ^ ^
* | | | | | | | (done)
* | | | | | | def_4:expect_rhs_expression:expr_progress
* | | | | | def_4:expect_rhs_expression
* | | | | def_3
* | | | def_2:expect_type
* | | def_1
* | def_0:expect_symbol
* expect_toplevel_expression_sequence
*
* def_0:expect_symbol: got 'def' keyword, symbol to follow
* def_1: got symbol name
* def_2:expect_symbol got (optional) colon, type name to follow
* def_3: got symbol type
* def_4:expect_rhs_expression got (optional) equal sign, value to follow
* (done): definition complete, pop exprstate from stack
*
**/
exprstatetype exs_type_;
/** generic expression **/
@ -255,5 +232,4 @@ namespace xo {
} /*namespace scm*/
} /*namespace xo*/
/** end exprstate.hpp **/