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

xo-reader2: simplify DExprSeqState w/ DSyntaxStateMachine

Browse source
This commit is contained in:
Roland Conybeare 2026-01-30 15:01:31 -05:00
commit 64bc59660b
2 changed files with 15 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

48
include/xo/reader2/DExprSeqState.hpp
View file

@ -5,8 +5,7 @@
#pragma once #pragma once
#include "ParserStateMachine.hpp" #include "DSyntaxStateMachine.hpp"
#include "SyntaxStateMachine.hpp"
#include "syntaxstatetype.hpp" #include "syntaxstatetype.hpp"
#include <xo/facet/obj.hpp> #include <xo/facet/obj.hpp>
@ -37,8 +36,9 @@ namespace xo {
* *
* Similar to exprseq_xs in xo-expresion * Similar to exprseq_xs in xo-expresion
**/ **/
class DExprSeqState { class DExprSeqState : public DSyntaxStateMachine<DExprSeqState> {
public: public:
using Super = DSyntaxStateMachine<DExprSeqState>;
using TypeDescr = xo::reflect::TypeDescr; using TypeDescr = xo::reflect::TypeDescr;
using AAllocator = xo::mm::AAllocator; using AAllocator = xo::mm::AAllocator;
using ppindentinfo = xo::print::ppindentinfo; using ppindentinfo = xo::print::ppindentinfo;
@ -54,6 +54,8 @@ namespace xo {
ParserStateMachine * p_psm); ParserStateMachine * p_psm);
public: public:
const char * ssm_classname() const noexcept { return "DExprSeqState"; }
/** @defgroup scm-exprseq-ssm-facet syntaxstatemachine facet methods **/ /** @defgroup scm-exprseq-ssm-facet syntaxstatemachine facet methods **/
///@{ ///@{
@ -91,16 +93,6 @@ namespace xo {
**/ **/
void on_if_token(const Token & tk, ParserStateMachine * p_psm); void on_if_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on incoming colon token @p tk,
* overall parser state in @p p_psm
**/
void on_colon_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on incoming single-assign token @p tk,
* overall parser state in @p p_psm
**/
void on_singleassign_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on incoming string token @p tk, /** update state for this syntax on incoming string token @p tk,
* overall parser state in @p p_psm * overall parser state in @p p_psm
**/ **/
@ -121,36 +113,6 @@ namespace xo {
**/ **/
void on_bool_token(const Token & tk, ParserStateMachine * p_psm); void on_bool_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on incoming semicolon token @p tk,
* overall parser state in @p p_psm
**/
void on_semicolon_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on parsed symbol @p sym
* from immediately-downstream ssm.
* overall parser state in @p p_psm
**/
void on_parsed_symbol(std::string_view sym, ParserStateMachine * p_psm);
/** update state for this syntax on parsed type-description @p td
* from nested ssm.
* overall parser state in @p p_psm
**/
void on_parsed_typedescr(TypeDescr td, ParserStateMachine * p_psm);
/** update this ssm to consume parsed formal param (name, value)
* emitted by nested ssm, with overall parser state in @p p_psm
**/
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);
/** update state for this syntax on parsed expression @p expr /** update state for this syntax on parsed expression @p expr
* from nested ssm. * from nested ssm.
* overall parser state in @p p_psm * overall parser state in @p p_psm

108
src/reader2/DExprSeqState.cpp
View file

@ -131,14 +131,6 @@ namespace xo {
this->on_if_token(tk, p_psm); this->on_if_token(tk, p_psm);
return; return;
case tokentype::tk_colon:
this->on_colon_token(tk, p_psm);
return;
case tokentype::tk_singleassign:
this->on_singleassign_token(tk, p_psm);
return;
case tokentype::tk_string: case tokentype::tk_string:
this->on_string_token(tk, p_psm); this->on_string_token(tk, p_psm);
return; return;
@ -155,10 +147,6 @@ namespace xo {
this->on_bool_token(tk, p_psm); this->on_bool_token(tk, p_psm);
return; return;
case tokentype::tk_semicolon:
this->on_semicolon_token(tk, p_psm);
return;
// all the not-yet handled cases // all the not-yet handled cases
case tokentype::tk_invalid: case tokentype::tk_invalid:
case tokentype::tk_leftparen: case tokentype::tk_leftparen:
@ -173,7 +161,10 @@ namespace xo {
case tokentype::tk_greatequal: case tokentype::tk_greatequal:
case tokentype::tk_dot: case tokentype::tk_dot:
case tokentype::tk_comma: case tokentype::tk_comma:
case tokentype::tk_colon:
case tokentype::tk_semicolon:
case tokentype::tk_doublecolon: case tokentype::tk_doublecolon:
case tokentype::tk_singleassign:
case tokentype::tk_assign: case tokentype::tk_assign:
case tokentype::tk_yields: case tokentype::tk_yields:
case tokentype::tk_plus: case tokentype::tk_plus:
@ -225,9 +216,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_symbol_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -264,9 +253,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_lambda_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -286,27 +273,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_if_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
}
void
DExprSeqState::on_colon_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExprSeqState::on_colon_token",
tk,
this->get_expect_str());
}
void
DExprSeqState::on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExprSeqState::on_singleassign_token",
tk,
this->get_expect_str());
} }
void void
@ -333,9 +300,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_string_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -361,9 +326,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_f64_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -389,9 +352,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_i64_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -417,56 +378,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExprSeqState::on_bool_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
}
void
DExprSeqState::on_semicolon_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExprSeqState::on_semicolon_token",
tk,
this->get_expect_str());
}
void
DExprSeqState::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_symbol("DExprSeqState::on_parsed_symbol",
sym,
this->get_expect_str());
}
void
DExprSeqState::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_typedescr("DExprSeqState::on_parsed_typedescr",
td,
this->get_expect_str());
}
void
DExprSeqState::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DExprSeqState::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DExprSeqState::on_parsed_formal_arglist(DArray * arglist,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal_arglist("DExprSeqState::on_parsed_formal_arglist",
arglist,
this->get_expect_str());
} }
void void