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

xo-reader2: simplify DSyntaxStateMachine w/ DExpectFormalArglistSsm

Browse source
This commit is contained in:
Roland Conybeare 2026-01-30 14:33:44 -05:00
commit 2fc57b1478
2 changed files with 10 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

44
include/xo/reader2/DExpectFormalArglistSsm.hpp
View file

@ -5,7 +5,7 @@
#pragma once #pragma once
#include "SyntaxStateMachine.hpp" #include "DSyntaxStateMachine.hpp"
#include <xo/object2/DArray.hpp> #include <xo/object2/DArray.hpp>
#include <xo/arena/DArena.hpp> #include <xo/arena/DArena.hpp>
@ -52,8 +52,9 @@ namespace xo {
/** @class expect_formal_arglist /** @class expect_formal_arglist
* @brief parser state-machine for a formal parameter list * @brief parser state-machine for a formal parameter list
**/ **/
class DExpectFormalArglistSsm { class DExpectFormalArglistSsm : public DSyntaxStateMachine<DExpectFormalArglistSsm> {
public: public:
using Super = DSyntaxStateMachine<DExpectFormalArglistSsm>;
using DArena = xo::mm::DArena; using DArena = xo::mm::DArena;
using TypeDescr = xo::reflect::TypeDescr; using TypeDescr = xo::reflect::TypeDescr;
using ppindentinfo = xo::print::ppindentinfo; using ppindentinfo = xo::print::ppindentinfo;
@ -71,6 +72,8 @@ namespace xo {
/** @defgroup scm-expectformalarglistssm-methods general methods **/ /** @defgroup scm-expectformalarglistssm-methods general methods **/
///@{ ///@{
const char * ssm_classname() const noexcept { return "DExpectFormalArglistSsm"; }
/** update state on incoming token @p tk, with overall parser state in @p p_psm **/ /** update state on incoming token @p tk, with overall parser state in @p p_psm **/
void on_leftparen_token(const Token & tk, void on_leftparen_token(const Token & tk,
ParserStateMachine * p_psm); ParserStateMachine * p_psm);
@ -99,18 +102,6 @@ namespace xo {
void on_token(const Token & tk, void on_token(const Token & tk,
ParserStateMachine * p_psm); ParserStateMachine * p_psm);
/** update state on parsed symbol @p sym emitted by nested ssm,
* with overall parser state in @p p_psm
**/
void on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm);
/** update state on parsed typedescr @p td emitted by nested ssm,
* with overall parser state in @p p_psm
**/
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
/** update state to consume parsed param (name,type) emitted by /** update state to consume parsed param (name,type) emitted by
* nested ssm, with overall parser state in @p p_psm * nested ssm, with overall parser state in @p p_psm
**/ **/
@ -118,31 +109,6 @@ namespace xo {
TypeDescr param_type, TypeDescr param_type,
ParserStateMachine * p_psm); 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 on parsed expression emitted by nested ssm
* with overall parser state in @p p_psm
**/
void on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm);
/** update state on parsed expression, along with following semicolon,
* emitted by nested ssm with overall parser state in @p p_psm
**/
void on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm);
#ifdef NOT_YET
virtual void on_comma_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_rightparen_token(const token_type & tk,
parserstatemachine * p_psm) override;
#endif
///@} ///@}
/** @defgroup scm-expectformalarglistssm-printable-facet printable facet methods **/ /** @defgroup scm-expectformalarglistssm-printable-facet printable facet methods **/
///@{ ///@{

66
src/reader2/DExpectFormalArglistSsm.cpp
View file

@ -171,27 +171,7 @@ namespace xo {
break; break;
} }
p_psm->illegal_input_on_token("DExpectFormalArglistSsm::on_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_symbol("DExpectFormalArglistSsm::on_parsed_symbol",
sym,
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_typedescr("DExpectFormalArglistSsm::on_parsed_typedescr",
td,
this->get_expect_str());
} }
void void
@ -238,37 +218,7 @@ namespace xo {
return; return;
} }
p_psm->illegal_parsed_formal("DExpectFormalArglistSsm::on_parsed_formal", Super::on_parsed_formal(param_name, param_type, p_psm);
param_name,
param_type,
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_formal_arglist(DArray * arglist,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal_arglist("DExpectFormalArglistSsm::on_parsed_formal_arglist",
arglist,
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExpectFormalArglistSsm::on_parsed_expression",
expr,
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExpectFormalArglistSsm::on_parsed_expression_with_semicolon",
expr,
this->get_expect_str());
} }
void void
@ -282,9 +232,7 @@ namespace xo {
return; return;
} }
p_psm->illegal_input_on_token("DExpectFormalArglistSsm::on_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -298,9 +246,7 @@ namespace xo {
return; return;
} }
p_psm->illegal_input_on_token("DExpectFormalArglistSsm::on_comma_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
void void
@ -315,9 +261,7 @@ namespace xo {
return; return;
} }
p_psm->illegal_input_on_token("DExpectFormalArglistSsm::on_rightparen_token", Super::on_token(tk, p_psm);
tk,
this->get_expect_str());
} }
bool bool