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

xo-reader: refactor: mv on_semicolon for def-expr to define_xs

Browse source
This commit is contained in:
Roland Conybeare 2024-08-08 14:16:12 -04:00
commit 149536b182
3 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/xo/reader/define_xs.hpp
View file

@ -39,6 +39,8 @@ namespace xo {
exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_colon(exprstatestack * p_stack) override;
virtual void on_semicolon(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
private:
/**

28
src/reader/define_xs.cpp
View file

@ -447,6 +447,34 @@ namespace xo {
}
}
void
define_xs::on_semicolon(exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
constexpr const char * self_name = "exprstate::on_semicolon";
if (!this->admits_semicolon())
{
throw std::runtime_error(tostr(self_name,
": unexpected semicolon for parsing state",
xtag("state", *this)));
}
if (this->exs_type_ == exprstatetype::def_5) {
rp<Expression> expr = this->def_expr_;
std::unique_ptr<exprstate> self = p_stack->pop_exprstate();
p_stack->top_exprstate().on_expr(expr,
p_stack,
p_emit_expr);
} else {
assert(false);
}
}
} /*namespace scm*/
} /*namespace xo*/

8
src/reader/exprstate.cpp
View file

@ -652,14 +652,6 @@ namespace xo {
*/
p_stack->top_exprstate().on_semicolon(p_stack, p_emit_expr);
} else if (this->exs_type_ == exprstatetype::def_5) {
rp<Expression> expr = this->def_expr_;
std::unique_ptr<exprstate> self = p_stack->pop_exprstate(); /* NOT KOSHER. invalidates *this */
p_stack->top_exprstate().on_expr(expr,
p_stack,
p_emit_expr);
} else {
assert(false);
}