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

xo-reader2: DLambdaSsm work towards producing DLambdaExpr [WIP]

Browse source
This commit is contained in:
Roland Conybeare 2026-01-31 21:33:39 -05:00
commit 726f821c4e
8 changed files with 218 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/reader2/DProgressSsm.cpp
View file

@ -205,7 +205,7 @@ namespace xo {
std::string_view
DProgressSsm::get_expect_str() const noexcept {
if (op_type_ == optype::invalid) {
return "oper|semicolon|rightparen";
return "oper|semicolon|rightparen|righbrace";
} else {
return "expr|leftparen";
}
@ -255,6 +255,10 @@ namespace xo {
this->on_semicolon_token(tk, p_psm);
return;
case tokentype::tk_rightbrace:
this->on_rightbrace_token(tk, p_psm);
return;
// all the not-yet handled cases
case tokentype::tk_invalid:
case tokentype::tk_def:
@ -264,7 +268,6 @@ namespace xo {
case tokentype::tk_leftbracket:
case tokentype::tk_rightbracket:
case tokentype::tk_leftbrace:
case tokentype::tk_rightbrace:
case tokentype::tk_leftangle:
case tokentype::tk_rightangle:
case tokentype::tk_lessequal:
@ -448,7 +451,8 @@ namespace xo {
obj<AExpression> expr = this->assemble_expr(p_psm);
{
obj<APrintable> expr_pr = FacetRegistry::instance().variant<APrintable,AExpression>(expr);
obj<APrintable> expr_pr
= FacetRegistry::instance().variant<APrintable,AExpression>(expr);
assert(expr_pr);
log && log(xtag("expr", expr_pr));
}
@ -475,6 +479,27 @@ namespace xo {
#endif
}
void
DProgressSsm::on_rightbrace_token(const Token & tk,
ParserStateMachine * p_psm)
{
scope log(XO_DEBUG(p_psm->debug_flag()));
(void)tk;
obj<AExpression> expr = this->assemble_expr(p_psm);
{
obj<APrintable> expr_pr
= FacetRegistry::instance().variant<APrintable,AExpression>(expr);
assert(expr_pr);
log && log(xtag("expr", expr_pr));
}
p_psm->pop_ssm();
p_psm->on_parsed_expression_with_token(expr, tk);
}
void
DProgressSsm::on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm)
@ -1024,7 +1049,8 @@ namespace xo {
"DProgressSsm",
refrtag("lhs", lhs),
refrtag("op", op_type_),
cond(rhs, refrtag("rhs", rhs), "nullptr")
cond(rhs, refrtag("rhs", rhs), "nullptr"),
refrtag("expect", this->get_expect_str())
);
}
@ -1048,6 +1074,7 @@ namespace xo {
std::string_view(errmsg_string));
p_psm->capture_error(c_self_name, errmsg);
return obj<AExpression>();
}
/* consecutive expressions not legal, e.g: