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

xo-parser: refactor: bypass exprir arg to pop exprstateaction

Browse source
This commit is contained in:
Roland Conybeare 2024-08-01 12:45:20 +10:00
commit 010f15641e
2 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/xo/parser/parser.hpp
View file

@ -134,14 +134,15 @@ namespace xo {
class expraction { class expraction {
public: public:
expraction() = default; expraction() = default;
expraction(expractiontype action_type, explicit expraction(expractiontype action_type,
const exprir & expr_ir) const exprir & expr_ir)
: action_type_{action_type}, expr_ir_{expr_ir} : action_type_{action_type}, expr_ir_{expr_ir}
{} {}
static expraction keep(); static expraction keep();
static expraction emit(const exprir & ir); static expraction emit(const exprir & ir);
static expraction pop(const exprir & ir); //static expraction pop(const exprir & ir);
static expraction pop();
expractiontype action_type() const { return action_type_; } expractiontype action_type() const { return action_type_; }
const exprir & expr_ir() const { return expr_ir_; } const exprir & expr_ir() const { return expr_ir_; }

50
src/parser/parser.cpp
View file

@ -110,11 +110,19 @@ namespace xo {
ir); ir);
} }
#ifdef OBSOLETE
expraction expraction
expraction::pop(const exprir & ir) { expraction::pop(const exprir & ir) {
return expraction(expractiontype::pop, return expraction(expractiontype::pop,
ir); ir);
} }
#endif
expraction
expraction::pop() {
return expraction(expractiontype::pop,
exprir());
}
void void
expraction::print(std::ostream & os) const { expraction::print(std::ostream & os) const {
@ -293,7 +301,7 @@ namespace xo {
expraction expraction
exprstate::on_symbol(const token_type & tk, exprstate::on_symbol(const token_type & tk,
exprstatestack * /*p_stack*/) exprstatestack * p_stack)
{ {
constexpr bool c_debug_flag = true; constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag)); scope log(XO_DEBUG(c_debug_flag));
@ -328,7 +336,12 @@ namespace xo {
case exprstatetype::expect_rhs_expression: case exprstatetype::expect_rhs_expression:
case exprstatetype::expect_symbol: case exprstatetype::expect_symbol:
return expraction::pop(exprir(exprirtype::symbol, tk.text())); /* have to do pop first */
p_stack->pop_exprstate();
return p_stack->top_exprstate().on_exprir
(exprir(exprirtype::symbol, tk.text()), p_stack);
//return expraction::pop(exprir(exprirtype::symbol, tk.text()));
case exprstatetype::expect_type: { case exprstatetype::expect_type: {
TypeDescr td = nullptr; TypeDescr td = nullptr;
@ -354,7 +367,10 @@ namespace xo {
xtag("typename", tk.text()))); xtag("typename", tk.text())));
} }
return expraction::pop(exprir(exprirtype::typedescr, td)); p_stack->pop_exprstate();
return p_stack->top_exprstate().on_exprir
(exprir(exprirtype::typedescr, td), p_stack);
//return expraction::pop(exprir(exprirtype::typedescr, td));
} }
case exprstatetype::invalid: case exprstatetype::invalid:
@ -420,7 +436,7 @@ namespace xo {
expraction expraction
exprstate::on_f64(const token_type & tk, exprstate::on_f64(const token_type & tk,
exprstatestack * /*p_stack*/) exprstatestack * p_stack)
{ {
constexpr bool c_debug_flag = true; constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag)); scope log(XO_DEBUG(c_debug_flag));
@ -435,8 +451,12 @@ namespace xo {
} }
if (this->exs_type_ == exprstatetype::expect_rhs_expression) { if (this->exs_type_ == exprstatetype::expect_rhs_expression) {
return expraction::pop(exprir(exprirtype::expression, p_stack->pop_exprstate();
Constant<double>::make(tk.f64_value())));
return p_stack->top_exprstate()
.on_exprir(exprir(exprirtype::expression,
Constant<double>::make(tk.f64_value())),
p_stack);
} else { } else {
assert(false); assert(false);
return expraction(); return expraction();
@ -522,7 +542,7 @@ namespace xo {
expraction expraction
exprstate::on_exprir(const exprir & ir, exprstate::on_exprir(const exprir & ir,
exprstatestack * /*p_stack*/) exprstatestack * p_stack)
{ {
constexpr bool c_debug_flag = true; constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag)); scope log(XO_DEBUG(c_debug_flag));
@ -580,7 +600,10 @@ namespace xo {
rp<Expression> def = DefineExpr::make(this->def_lhs_symbol_, rp<Expression> def = DefineExpr::make(this->def_lhs_symbol_,
rhs_value); rhs_value);
return expraction::pop(exprir(exprirtype::expression, def)); p_stack->pop_exprstate();
return p_stack->top_exprstate()
.on_exprir(exprir(exprirtype::expression, def),
p_stack);
} else { } else {
assert(false); assert(false);
return expraction(); return expraction();
@ -707,17 +730,6 @@ namespace xo {
&xs_stack_)); &xs_stack_));
break; break;
#ifdef OBSOLETE
case expractiontype::push1:
xs_stack_.push_exprstate(action.push_exs1());
return nullptr;
case expractiontype::push2:
xs_stack_.push_exprstate(action.push_exs1());
xs_stack_.push_exprstate(action.push_exs2());
return nullptr;
#endif
case expractiontype::invalid: case expractiontype::invalid:
case expractiontype::n_expractiontype: case expractiontype::n_expractiontype:
/* unreachable */ /* unreachable */