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

xo-reader2: streamline DIfElseSsm w/ DSyntaxStateMachine

Browse source
This commit is contained in:
Roland Conybeare 2026-01-30 13:49:57 -05:00
commit 470d40c24d
2 changed files with 14 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

18
xo-reader2/include/xo/reader2/DIfElseSsm.hpp
View file

@ -5,14 +5,12 @@
#pragma once
#include "DSyntaxStateMachine.hpp"
#include <xo/expression2/DIfElseExpr.hpp>
#include "ParserStateMachine.hpp"
#include "syntaxstatetype.hpp"
#include <xo/expression2/detail/IExpression_DIfElseExpr.hpp>
#include <xo/expression2/DIfElseExpr.hpp>
#include <xo/facet/obj.hpp>
//#include "exprstate.hpp"
//#include "xo/indentlog/print/ppdetail_atomic.hpp"
namespace xo {
namespace scm {
@ -54,8 +52,9 @@ namespace xo {
/** @class DIfElseSsm
* @brief syntax state machine for parsing a conditional expression
**/
class DIfElseSsm {
class DIfElseSsm : public DSyntaxStateMachine<DIfElseExpr> {
public:
using Super = DSyntaxStateMachine<DIfElseExpr>;
using AAllocator = xo::mm::AAllocator;
using DArena = xo::mm::DArena;
using TypeDescr = xo::reflect::TypeDescr;
@ -89,6 +88,9 @@ namespace xo {
static void start(DArena & parser_mm,
obj<AAllocator> expr_mm,
ParserStateMachine * p_psm);
const char * ssm_classname() const noexcept { return "DIfElseSsm"; }
///@}
/** @defgroup scm-ifelsessm-expression-methods general methods **/
///@{
@ -140,6 +142,7 @@ namespace xo {
void on_semicolon_token(const Token & tk,
ParserStateMachine * p_psm);
#ifdef OBSOLETE
/** update state for this syntax after parsing a symbol @p sym,
* with overall parser state in @p p_psm
**/
@ -158,12 +161,7 @@ namespace xo {
void on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm);
/** consume formal params @p arglist from completed nested ssm,
* with overall parser state in @p p_psm.
**/
void on_parsed_formal_arglist(DArray * arglist,
ParserStateMachine * p_psm);
#endif
/** update state for this syntax after parsing an expression @p expr,
* overall parser state in @p p_psm.

126
xo-reader2/src/reader2/DIfElseSsm.cpp
View file

@ -189,21 +189,9 @@ namespace xo {
break;
}
p_psm->illegal_input_on_token("DIfElseSsm::on_token",
tk,
this->get_expect_str());
Super::on_token(tk, p_psm);
}
#ifdef NOT_YET
// ----- if_else_xs -----
if_else_xs::if_else_xs(rp<IfExprAccess> if_expr)
: exprstate(exprstatetype::ifexpr),
ifxs_type_{ifexprstatetype::if_0},
if_expr_{std::move(if_expr)}
{}
#endif
void
DIfElseSsm::on_if_token(const Token & tk,
ParserStateMachine * p_psm)
@ -219,9 +207,7 @@ namespace xo {
return;
}
p_psm->illegal_input_on_token("DIfElseSsm::on_if_token",
tk,
this->get_expect_str());
Super::on_token(tk, p_psm);
}
void
@ -239,34 +225,9 @@ namespace xo {
return;
}
p_psm->illegal_input_on_token("DIfElseSsm::on_then_token",
tk,
this->get_expect_str());
Super::on_token(tk, p_psm);
}
#ifdef NOT_YET
void
if_else_xs::on_else_token(const token_type & tk,
parserstatemachine * p_psm)
{
scope log(XO_DEBUG(p_psm->debug_flag()));
log && log("ifxs_type", ifxs_type_);
if (this->ifxs_type_ == ifexprstatetype::if_4) {
this->ifxs_type_ = ifexprstatetype::if_5;
expect_expr_xs::start(p_psm);
return;
}
constexpr const char * c_self_name = "if_else_xs::on_else_token";
const char * exp = this->get_expect_str();
this->illegal_input_on_token(c_self_name, tk, exp, p_psm);
}
#endif
void
DIfElseSsm::on_else_token(const Token & tk,
ParserStateMachine * p_psm)
@ -282,9 +243,7 @@ namespace xo {
return;
}
p_psm->illegal_input_on_token("DIfElseSsm::on_else_token",
tk,
this->get_expect_str());
Super::on_token(tk, p_psm);
}
#ifdef NOT_YET
@ -325,37 +284,6 @@ namespace xo {
p_psm->on_rightbrace_token(tk);
}
void
if_else_xs::on_semicolon_token(const token_type & tk,
parserstatemachine * p_psm)
{
scope log(XO_DEBUG(p_psm->debug_flag()));
log && log("ifxs_type", ifxs_type_);
const char * c_self_name = "if_else_xs::on_semicolon_token";
switch (this->ifxs_type_) {
case ifexprstatetype::invalid:
case ifexprstatetype::if_0:
case ifexprstatetype::n_ifexprstatetype:
// unreachable
assert(false);
break;
case ifexprstatetype::if_1:
case ifexprstatetype::if_2:
case ifexprstatetype::if_3:
case ifexprstatetype::if_5:
this->illegal_input_on_token(c_self_name, tk, get_expect_str(), p_psm);
break;
case ifexprstatetype::if_4:
case ifexprstatetype::if_6: {
this->finish_and_continue(p_psm);
break;
}
}
}
#endif
void
@ -385,18 +313,7 @@ namespace xo {
return;
}
p_psm->illegal_input_on_token("DIfElseSsm::on_semicolon_token",
tk, this->get_expect_str());
}
void
DIfElseSsm::on_parsed_formal_arglist(DArray * arglist,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal_arglist("DIfElseSsm::on_parsed_formal_arglist",
arglist,
this->get_expect_str());
Super::on_token(tk, p_psm);
}
#ifdef NOT_YET
@ -485,9 +402,7 @@ namespace xo {
break;
}
p_psm->illegal_parsed_expression("DIfElseSsm::on_parsed_expression",
expr,
this->get_expect_str());
Super::on_parsed_expression(expr, p_psm);
}
void
@ -500,35 +415,6 @@ namespace xo {
this->on_semicolon_token(Token::semicolon_token(), p_psm);
}
void
DIfElseSsm::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_symbol("DIfElseSsm::on_parsed_symbol",
sym,
this->get_expect_str());
}
void
DIfElseSsm::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_typedescr("DIfElseSsm::on_parsed_typedescr",
td,
this->get_expect_str());
}
void
DIfElseSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DIfElseSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
bool
DIfElseSsm::pretty(const ppindentinfo & ppii) const
{