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

xo-parser: simplify: exprstate::on_exprir drop retval

Browse source
This commit is contained in:
Roland Conybeare 2024-08-01 13:13:12 +10:00
commit cd83b6bed9
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,7 +226,7 @@ namespace xo {
/** update exprstate in response to IR (intermediate representation)
* from nested parsing task
**/
expraction on_exprir(const exprir & ir, exprstatestack * p_stack, rp<Expression> * p_emit_expr);
void on_exprir(const exprir & ir, exprstatestack * p_stack, rp<Expression> * p_emit_expr);
/** print human-readable representation on @p os **/
void print(std::ostream & os) const;

20
src/parser/parser.cpp
View file

@ -516,7 +516,7 @@ namespace xo {
assert(false);
}
expraction
void
exprstate::on_exprir(const exprir & ir,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
@ -536,30 +536,30 @@ namespace xo {
if (ir.xir_type() == exprirtype::expression) {
*p_emit_expr = ir.expr();
return expraction::keep();
return;
}
/* NOT IMPLEMENTED */
assert(false);
return expraction();
return;
case exprstatetype::def_0:
this->exs_type_ = exprstatetype::def_1;
this->def_lhs_symbol_ = ir.symbol_name();
return expraction::keep();
return;
case exprstatetype::def_1:
/* NOT IMPLEMENTED */
assert(false);
return expraction();
return;
case exprstatetype::def_2:
this->exs_type_ = exprstatetype::def_3;
this->def_lhs_td_ = ir.td();
return expraction::keep();
return;
case exprstatetype::def_3:
/* NOT IMPLEMENTED */
assert(false);
return expraction();
return;
case exprstatetype::def_4:
/* have all the ingredients to create an expression
* representing a definition
@ -585,7 +585,7 @@ namespace xo {
p_stack, p_emit_expr);
} else {
assert(false);
return expraction();
return;
}
case exprstatetype::expect_rhs_expression:
@ -595,12 +595,12 @@ namespace xo {
* (this exprstate issues pop instruction from exprstate::on_input()
*/
assert(false);
return expraction();
return;
case exprstatetype::invalid:
case exprstatetype::n_exprstatetype:
/* unreachable */
assert(false);
return expraction();
return;
}
}