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

xo-reader: simplify expect_expr_xs,expect_lparen_xs using qsm

Browse source
This commit is contained in:
Roland Conybeare 2024-08-19 16:48:58 -04:00
commit 0b0c424b84
7 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/reader/progress_xs.cpp
View file

@ -319,7 +319,7 @@ namespace xo {
this->op_type_ = tk2op(tk.tk_type());
/* infix operator must be followed by non-empty expression */
expect_expr_xs::start(p_stack);
expect_expr_xs::start(p_psm);
} else if (rhs_) {
/* already have complete expression stashed.
* behavior depends on operator precedence for tk with stored operator
@ -348,7 +348,7 @@ namespace xo {
progress_xs::start(expr, op2, p_stack);
/* infix operator must be followed by non-empty expression */
expect_expr_xs::start(p_stack);
expect_expr_xs::start(p_psm);
} else {
/* e.g.
* 6.2 + 4.9 * ...
@ -367,9 +367,9 @@ namespace xo {
/* 1. replace with nested incomplete infix exprs */
progress_xs::start(lhs_, op_type_, p_stack);
expect_expr_xs::start(p_stack);
expect_expr_xs::start(p_psm);
progress_xs::start(rhs_, op2, p_stack);
expect_expr_xs::start(p_stack);
expect_expr_xs::start(p_psm);
}
} else {