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

xo-reader2: simplify DExpectTypeSsm w/ DSyntaxStateMachine

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

187
src/reader2/DExpectTypeSsm.cpp
View file

@ -66,44 +66,14 @@ namespace xo {
this->on_symbol_token(tk, p_psm);
break;
case tokentype::tk_def:
this->on_def_token(tk, p_psm);
break;
case tokentype::tk_if:
this->on_if_token(tk, p_psm);
break;
case tokentype::tk_colon:
this->on_colon_token(tk, p_psm);
break;
case tokentype::tk_singleassign:
this->on_singleassign_token(tk, p_psm);
break;
case tokentype::tk_string:
this->on_string_token(tk, p_psm);
break;
case tokentype::tk_f64:
this->on_f64_token(tk, p_psm);
break;
case tokentype::tk_i64:
this->on_i64_token(tk, p_psm);
break;
case tokentype::tk_bool:
this->on_bool_token(tk, p_psm);
break;
case tokentype::tk_semicolon:
this->on_semicolon_token(tk, p_psm);
break;
// all the not-yet handled cases
case tokentype::tk_invalid:
case tokentype::tk_def:
case tokentype::tk_if:
case tokentype::tk_f64:
case tokentype::tk_i64:
case tokentype::tk_bool:
case tokentype::tk_string:
case tokentype::tk_leftparen:
case tokentype::tk_rightparen:
case tokentype::tk_leftbracket:
@ -116,8 +86,11 @@ namespace xo {
case tokentype::tk_greatequal:
case tokentype::tk_dot:
case tokentype::tk_comma:
case tokentype::tk_colon:
case tokentype::tk_semicolon:
case tokentype::tk_doublecolon:
case tokentype::tk_assign:
case tokentype::tk_singleassign:
case tokentype::tk_yields:
case tokentype::tk_plus:
case tokentype::tk_minus:
@ -140,87 +113,6 @@ namespace xo {
}
}
void
DExpectTypeSsm::on_def_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_if_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DxpectTypeSsm",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_colon_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DxpectTypeSsm",
tk,
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_string_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_f64_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_i64_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm::on_i64_token",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_bool_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm::on_bool_token",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_semicolon_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectTypeSsm::on_semicolon_token",
tk,
this->get_expect_str());
}
void
DExpectTypeSsm::on_symbol_token(const Token & tk,
ParserStateMachine * p_psm)
@ -247,71 +139,14 @@ namespace xo {
td = Reflect::require<std::int64_t>();
if (!td) {
p_psm->illegal_input_on_token("DExpectTypeSsm::on_symbol_token",
tk,
this->get_expect_str());
Super::on_token(tk, p_psm);
return;
}
p_psm->pop_ssm();
p_psm->on_parsed_typedescr(td);
}
void
DExpectTypeSsm::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_symbol("ExpectTypeSsm::on_parsed_symbol",
sym,
this->get_expect_str());
}
void
DExpectTypeSsm::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_typedescr("ExpectTypeSsm::on_parsed_typedescr",
td,
this->get_expect_str());
}
void
DExpectTypeSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DExpectTypeSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DExpectTypeSsm::on_parsed_formal_arglist(DArray * arglist,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal_arglist("DExpectTypeSsm::on_parsed_formal_arglist",
arglist,
this->get_expect_str());
}
void
DExpectTypeSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExpectTypeSsm::on_parsed_expression",
expr,
this->get_expect_str());
}
void
DExpectTypeSsm::on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExpectTypeSsm::on_parsed_expression_with_semicolon",
expr,
this->get_expect_str());
}
bool
DExpectTypeSsm::pretty(const ppindentinfo & ppii) const
{