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

xo-reader2: use DUniqueString* to report parsed formal

Browse source
This commit is contained in:
Roland Conybeare 2026-01-29 12:24:46 -05:00
commit 1c2352c008
50 changed files with 377 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xo-reader2/src/reader2/DDefineSsm.cpp
View file

@ -704,6 +704,17 @@ namespace xo {
this->get_expect_str());
}
void
DDefineSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DDefineSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DDefineSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

15
xo-reader2/src/reader2/DExpectExprSsm.cpp
View file

@ -340,7 +340,7 @@ namespace xo {
DExpectExprSsm::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_symbol("DExpectExprSsm",
p_psm->illegal_input_on_symbol("DExpectExprSsm::on_parsed_symbol",
sym,
this->get_expect_str());
}
@ -349,11 +349,22 @@ namespace xo {
DExpectExprSsm::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_typedescr("DExpectExprSsm",
p_psm->illegal_input_on_typedescr("DExpectExprSsm::on_parsed_typedescr",
td,
this->get_expect_str());
}
void
DExpectExprSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DExpectExprSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DExpectExprSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

27
xo-reader2/src/reader2/DExpectFormalArgSsm.cpp
View file

@ -166,6 +166,10 @@ namespace xo {
ParserStateMachine * p_psm)
{
if (fstate_ == formalstatetype::formal_0) {
// parsed symbol @c sym is stored in tokenizer memory;
// must be copied to storage with expression lifetime,
// hence call to intern_string()
this->fstate_ = formalstatetype::formal_1;
this->name_ = p_psm->intern_string(sym);
return;
@ -180,11 +184,34 @@ namespace xo {
DExpectFormalArgSsm::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
if (fstate_ == formalstatetype::formal_2) {
assert(name_);
p_psm->pop_ssm();
p_psm->on_parsed_formal(name_, td);
return;
}
p_psm->illegal_input_on_typedescr("DExpectFormalArgSsm::on_parsed_typedescr",
td,
this->get_expect_str());
}
void
DExpectFormalArgSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
// NOTE: (param_name,param_type) *produced* by this SSM,
// but never *consumed*
p_psm->illegal_parsed_formal("DExpectFormalArgSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DExpectFormalArgSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

11
xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp
View file

@ -186,6 +186,17 @@ namespace xo {
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DExpectFormalArglistSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DExpectFormalArglistSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

11
xo-reader2/src/reader2/DExpectSymbolSsm.cpp
View file

@ -73,6 +73,17 @@ namespace xo {
this->get_expect_str());
}
void
DExpectSymbolSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DExpectSymbolSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DExpectSymbolSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

17
xo-reader2/src/reader2/DExpectTypeSsm.cpp
View file

@ -247,7 +247,7 @@ namespace xo {
td = Reflect::require<std::int64_t>();
if (!td) {
p_psm->illegal_input_on_token("DExpectTypeSsm",
p_psm->illegal_input_on_token("DExpectTypeSsm::on_symbol_token",
tk,
this->get_expect_str());
}
@ -260,7 +260,7 @@ namespace xo {
DExpectTypeSsm::on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_symbol("ExpectTypeSsm",
p_psm->illegal_input_on_symbol("ExpectTypeSsm::on_parsed_symbol",
sym,
this->get_expect_str());
}
@ -269,11 +269,22 @@ namespace xo {
DExpectTypeSsm::on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_typedescr("ExpectTypeSsm",
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_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

11
xo-reader2/src/reader2/DExprSeqState.cpp
View file

@ -449,6 +449,17 @@ namespace xo {
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_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

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

@ -510,6 +510,17 @@ namespace xo {
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
{

35
xo-reader2/src/reader2/DLambdaSsm.cpp
View file

@ -192,18 +192,6 @@ namespace xo {
#ifdef NOT_YET
void
lambda_xs::on_lambda_token(const token_type & tk,
parserstatemachine * p_psm)
{
if (lmxs_type_ == lambdastatetype::lm_0) {
this->lmxs_type_ = lambdastatetype::lm_1;
expect_formal_arglist_xs::start(p_psm);
} else {
exprstate::on_lambda_token(tk, p_psm);
}
}
void
lambda_xs::on_formal_arglist(const std::vector<rp<Variable>> & argl,
parserstatemachine * p_psm)
@ -351,13 +339,14 @@ namespace xo {
}
void
DLambdaSsm::on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm)
DLambdaSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression
("DLambdaSsm::on_parsed_expression_with_semicolon",
expr,
this->get_expect_str());
p_psm->illegal_parsed_formal("DLambdaSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
@ -369,6 +358,16 @@ namespace xo {
this->get_expect_str());
}
void
DLambdaSsm::on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression
("DLambdaSsm::on_parsed_expression_with_semicolon",
expr,
this->get_expect_str());
}
#ifdef NOT_YET
void
lambda_xs::on_expr(bp<Expression> expr,

11
xo-reader2/src/reader2/DProgressSsm.cpp
View file

@ -555,6 +555,17 @@ namespace xo {
this->get_expect_str());
}
void
DProgressSsm::on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_formal("DProgressSsm::on_parsed_formal",
param_name,
param_type,
this->get_expect_str());
}
void
DProgressSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)

2
xo-reader2/src/reader2/IPrintable_DLambdaSsm.cpp
View file

@ -2,7 +2,7 @@
*
* Generated automagically from ingredients:
* 1. code generator:
* [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet]
* [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IPrintable_DLambdaSsm.json5]
* 2. jinja2 template for abstract facet .hpp file:

6
xo-reader2/src/reader2/ISyntaxStateMachine_Any.cpp
View file

@ -52,6 +52,12 @@ ISyntaxStateMachine_Any::on_parsed_typedescr(Opaque, TypeDescr, ParserStateMachi
_fatal();
}
auto
ISyntaxStateMachine_Any::on_parsed_formal(Opaque, const DUniqueString *, TypeDescr, ParserStateMachine *) -> void
{
_fatal();
}
auto
ISyntaxStateMachine_Any::on_parsed_expression(Opaque, obj<AExpression>, ParserStateMachine *) -> void
{

5
xo-reader2/src/reader2/ISyntaxStateMachine_DDefineSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_parsed_formal(DDefineSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_parsed_expression(DDefineSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DExpectExprSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectExprSsm::on_parsed_formal(DExpectExprSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DExpectExprSsm::on_parsed_expression(DExpectExprSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DExpectFormalArgSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectFormalArgSsm::on_parsed_formal(DExpectFormalArgSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DExpectFormalArgSsm::on_parsed_expression(DExpectFormalArgSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DExpectFormalArglistSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectFormalArglistSsm::on_parsed_formal(DExpectFormalArglistSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DExpectFormalArglistSsm::on_parsed_expression(DExpectFormalArglistSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DExpectSymbolSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_parsed_formal(DExpectSymbolSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_parsed_expression(DExpectSymbolSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DExpectTypeSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_parsed_formal(DExpectTypeSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_parsed_expression(DExpectTypeSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DExprSeqState.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_parsed_formal(DExprSeqState & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_parsed_expression(DExprSeqState & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

5
xo-reader2/src/reader2/ISyntaxStateMachine_DIfElseSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DIfElseSsm::on_parsed_formal(DIfElseSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DIfElseSsm::on_parsed_expression(DIfElseSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

10
xo-reader2/src/reader2/ISyntaxStateMachine_DLambdaSsm.cpp
View file

@ -2,7 +2,7 @@
*
* Generated automagically from ingredients:
* 1. code generator:
* [/Users/roland/proj/xo-umbrella2/xo-facet/codegen/genfacet]
* [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet]
* arguments:
* --input [idl/ISyntaxStateMachine_DLambdaSsm.json5]
* 2. jinja2 template for abstract facet .hpp file:
@ -32,7 +32,6 @@ namespace xo {
{
self.on_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DLambdaSsm::on_parsed_symbol(DLambdaSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
{
@ -44,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DLambdaSsm::on_parsed_formal(DLambdaSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DLambdaSsm::on_parsed_expression(DLambdaSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
@ -57,4 +61,4 @@ namespace xo {
} /*namespace scm*/
} /*namespace xo*/
/* end ISyntaxStateMachine_DLambdaSsm.cpp */
/* end ISyntaxStateMachine_DLambdaSsm.cpp */

5
xo-reader2/src/reader2/ISyntaxStateMachine_DProgressSsm.cpp
View file

@ -43,6 +43,11 @@ namespace xo {
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DProgressSsm::on_parsed_formal(DProgressSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
{
self.on_parsed_formal(param_name, param_type, p_psm);
}
auto
ISyntaxStateMachine_DProgressSsm::on_parsed_expression(DProgressSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);

36
xo-reader2/src/reader2/ParserStateMachine.cpp
View file

@ -129,6 +129,17 @@ namespace xo {
this->stack_->top().on_parsed_typedescr(td, this);
}
void
ParserStateMachine::on_parsed_formal(const DUniqueString * sym,
TypeDescr td)
{
scope log(XO_DEBUG(debug_flag_), xtag("sym", std::string_view(*sym)), xtag("td", td));
assert(stack_);
this->stack_->top().on_parsed_formal(sym, td, this);
}
void
ParserStateMachine::on_parsed_expression(obj<AExpression> expr)
{
@ -248,6 +259,31 @@ namespace xo {
this->capture_error(ssm_name, errmsg);
}
void
ParserStateMachine::illegal_parsed_formal(std::string_view ssm_name,
const DUniqueString * param_name,
TypeDescr param_type,
std::string_view expect_str)
{
// TODO:
// - want to write error message using DArena
// - need something like log_streambuf and/or tostr() that's arena-aware
auto errmsg_string = tostr("Unexpected expression",
xtag("param_name", std::string_view(*param_name)),
xtag("param_type", param_type),
xtag("expecting", expect_str),
xtag("ssm", ssm_name),
xtag("via", "ParserStateMachine::illegal_parsed_expression"));
assert(expr_alloc_);
auto errmsg = DString::from_view(expr_alloc_,
std::string_view(errmsg_string));
this->capture_error(ssm_name, errmsg);
}
void
ParserStateMachine::illegal_parsed_expression(std::string_view ssm_name,
obj<AExpression> expr,