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

xo-reader2: more work on apply expressions [WIP]

Browse source
This commit is contained in:
Roland Conybeare 2026-02-11 20:25:24 -05:00
commit e0ab3c5927
6 changed files with 238 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/reader2/DProgressSsm.cpp
View file

@ -267,11 +267,14 @@ namespace xo {
this->on_leftparen_token(tk, p_psm);
return;
case tokentype::tk_rightparen:
this->on_rightparen_token(tk, p_psm);
return;
// all the not-yet handled cases
case tokentype::tk_invalid:
case tokentype::tk_def:
case tokentype::tk_if:
case tokentype::tk_rightparen:
case tokentype::tk_leftbracket:
case tokentype::tk_rightbracket:
case tokentype::tk_leftbrace:
@ -937,6 +940,9 @@ namespace xo {
this->lhs_ = obj<AExpression>();
DApplySsm::start(fn_expr, p_psm);
// + send leftparen to just-pushed apply
p_psm->on_token(tk);
return;
}
@ -986,7 +992,40 @@ namespace xo {
this->illegal_input_on_token(c_self_name, tk, exp, p_psm);
}
#endif
void
DProgressSsm::on_rightparen_token(const Token & tk,
ParserStateMachine * p_psm)
{
/* note: implementation parallels .on_semicolon_token() */
scope log(XO_DEBUG(p_psm->debug_flag()));
/* stack may be something like:
*
* [0] DProgressSsm
* [1] DExpectExprSsm
* [2] DApplySsm
*
* where we want rightparen to resolve in [2] DApplySsm,
* after triggering completion of [0] and [1]
*/
auto expr = this->assemble_expr(p_psm);
if (expr) {
/* 1. popping self from parser stack.. */
p_psm->pop_ssm();
/* 2. report parsed subexpr to parent ssm, along with the triggering rightparen **/
p_psm->on_parsed_expression_with_token(expr, tk);
return;
}
Super::on_token(tk, p_psm);
}
#ifdef NOT_YET
void
progress_xs::on_rightparen_token(const token_type & tk,
parserstatemachine * p_psm)