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

xo-reader2: scaffold on_singleassign_token() in PSM

Browse source
This commit is contained in:
Roland Conybeare 2026-01-21 12:59:06 -05:00
commit a3f5b12955
24 changed files with 139 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/reader2/DDefineSsm.cpp
View file

@ -543,6 +543,28 @@ namespace xo {
this->get_expect_str());
}
void
DDefineSsm::on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm)
{
scope log(XO_DEBUG(true), xtag("defstate", defstate_));
if ((defstate_ == defexprstatetype::def_2)
|| (defstate_ == defexprstatetype::def_4))
{
this->defstate_ = defexprstatetype::def_5;
// TODO: DExpectExprSsm::start(...)
log && log("STUB: DExpectExprSsm not implemented");
return;
}
p_psm->illegal_input_on_token("DDefineSsm::on_singleassign_token",
tk,
this->get_expect_str());
}
bool
DDefineSsm::pretty(const ppindentinfo & ppii) const
{

9
src/reader2/DExpectSymbolSsm.cpp
View file

@ -122,6 +122,15 @@ namespace xo {
this->get_expect_str());
}
void
DExpectSymbolSsm::on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectSymbolSsm::on_singleassign_token",
tk,
this->get_expect_str());
}
bool
DExpectSymbolSsm::pretty(const ppindentinfo & ppii) const
{

9
src/reader2/DExpectTypeSsm.cpp
View file

@ -83,6 +83,15 @@ namespace xo {
this->get_expect_str());
}
void
DExpectTypeSsm::on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm::on_singleassign_token",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_symbol_token(const Token & tk,
ParserStateMachine * p_psm)

9
src/reader2/DExprSeqState.cpp
View file

@ -169,6 +169,15 @@ namespace xo {
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
DExprSeqState::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)

6
src/reader2/ISyntaxStateMachine_Any.cpp
View file

@ -58,6 +58,12 @@ ISyntaxStateMachine_Any::on_colon_token(Opaque, const Token &, ParserStateMachin
_fatal();
}
auto
ISyntaxStateMachine_Any::on_singleassign_token(Opaque, const Token &, ParserStateMachine *) -> void
{
_fatal();
}
auto
ISyntaxStateMachine_Any::on_parsed_symbol(Opaque, std::string_view, ParserStateMachine *) -> void
{

5
src/reader2/ISyntaxStateMachine_DDefineSsm.cpp
View file

@ -48,6 +48,11 @@ namespace xo {
self.on_colon_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_singleassign_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_singleassign_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_parsed_symbol(DDefineSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
{
self.on_parsed_symbol(sym, p_psm);

5
src/reader2/ISyntaxStateMachine_DExpectSymbolSsm.cpp
View file

@ -48,6 +48,11 @@ namespace xo {
self.on_colon_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_singleassign_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_singleassign_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_parsed_symbol(DExpectSymbolSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
{
self.on_parsed_symbol(sym, p_psm);

5
src/reader2/ISyntaxStateMachine_DExpectTypeSsm.cpp
View file

@ -48,6 +48,11 @@ namespace xo {
self.on_colon_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_singleassign_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_singleassign_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_parsed_symbol(DExpectTypeSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
{
self.on_parsed_symbol(sym, p_psm);

5
src/reader2/ISyntaxStateMachine_DExprSeqState.cpp
View file

@ -48,6 +48,11 @@ namespace xo {
self.on_colon_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_singleassign_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_singleassign_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_parsed_symbol(DExprSeqState & self, std::string_view sym, ParserStateMachine * p_psm) -> void
{
self.on_parsed_symbol(sym, p_psm);

13
src/reader2/ParserStateMachine.cpp
View file

@ -153,6 +153,10 @@ namespace xo {
this->on_colon_token(tk);
break;
case tokentype::tk_singleassign:
this->on_singleassign_token(tk);
break;
// all the not-yet handled cases
case tokentype::tk_invalid:
case tokentype::tk_bool:
@ -173,7 +177,6 @@ namespace xo {
case tokentype::tk_comma:
case tokentype::tk_doublecolon:
case tokentype::tk_semicolon:
case tokentype::tk_singleassign:
case tokentype::tk_assign:
case tokentype::tk_yields:
case tokentype::tk_plus:
@ -229,6 +232,14 @@ namespace xo {
stack_->top().on_colon_token(tk, this);
}
void
ParserStateMachine::on_singleassign_token(const Token & tk)
{
scope log(XO_DEBUG(debug_flag_), xtag("tk", tk));
stack_->top().on_singleassign_token(tk, this);
}
void
ParserStateMachine::capture_error(std::string_view ssm_name,
const DString * errmsg)