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

xo-reader: refactor: + expect_expr_xs cls [wip]

Browse source
This commit is contained in:
Roland Conybeare 2024-08-09 20:20:57 -04:00
commit 5a4923e5cf
6 changed files with 62 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/reader/exprstate.cpp
View file

@ -4,6 +4,7 @@
#include "define_xs.hpp"
#include "progress_xs.hpp"
#include "paren_xs.hpp"
#include "expect_expr_xs.hpp"
//#include "xo/expression/DefineExpr.hpp"
#include "xo/expression/Constant.hpp"
//#include "xo/expression/ConvertExpr.hpp"
@ -491,7 +492,7 @@ namespace xo {
if (this->exs_type_ == exprstatetype::expect_rhs_expression) {
/* push lparen_0 to remember to look for subsequent rightparen. */
p_stack->push_exprstate(paren_xs::lparen_0());
p_stack->push_exprstate(exprstate::expect_rhs_expression());
p_stack->push_exprstate(expect_expr_xs::expect_rhs_expression());
}
}
@ -660,7 +661,7 @@ namespace xo {
case exprstatetype::expect_rhs_expression: {
std::unique_ptr<exprstate> self = p_stack->pop_exprstate(); /* NOT KOSHER. invalidates *this */
std::unique_ptr<exprstate> self = p_stack->pop_exprstate();
p_stack->top_exprstate().on_expr(expr,
p_stack,