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

xo-reader2: + SyntaxStateMachine.on_parsed_expression()

Browse source
This commit is contained in:
Roland Conybeare 2026-01-22 15:49:07 -05:00
commit cfff71c4a9
32 changed files with 185 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
idl/SyntaxStateMachine.json5
View file

@ -126,5 +126,14 @@
{type: "ParserStateMachine *", name: "p_psm"},
],
},
{
name: "on_parsed_expression",
doc: ["update state machine for incoming parsed expression @p expr"],
return_type: "void",
args: [
{type: "obj<AExpression>", name: "expr"},
{type: "ParserStateMachine *", name: "p_psm"},
],
},
],
}

6
include/xo/reader2/DDefineSsm.hpp
View file

@ -171,6 +171,12 @@ namespace xo {
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
/** update state for this syntax after parsing an expression @p expr,
* overall parser state in @p p_psm
**/
void on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm);
///@}
/** @defgroup scm-define-printable-facet printable facet methods **/
///@{

6
include/xo/reader2/DExpectExprSsm.hpp
View file

@ -107,6 +107,12 @@ namespace xo {
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
/** update state for this syntax after parsing an expression @p expr,
* overall parser state in @p p_psm
**/
void on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm);
///@}
/** @defgroup scm-define-printable-facet printable facet methods **/
///@{

7
include/xo/reader2/DExpectSymbolSsm.hpp
View file

@ -79,6 +79,13 @@ namespace xo {
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
/** update state for this syntax after parsing an expression @p expr
* in nested state machine.
* (provided to satisfy ASyntaxStateMachine api. not reachable)
**/
void on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming token @p tk,
* overall parser state in @p p_psm.
**/

7
include/xo/reader2/DExpectTypeSsm.hpp
View file

@ -107,6 +107,13 @@ namespace xo {
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on receiving expression
* from nested parser.
* (provided to satisfy ASyntaxStateMachine api. not reachable)
**/
void on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm);
///@}
/** @defgroup scm-expecttype-printable-facet printable facet methods **/
///@{

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

@ -112,6 +112,12 @@ namespace xo {
**/
void on_parsed_typedescr(TypeDescr td, ParserStateMachine * p_psm);
/** update state for this syntax on parsed expression @p expr
* from nested ssm.
* overall parser state in @p p_psm
**/
void on_parsed_expression(obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
/** @defgroup scm-exprseq-printable-facet printable facet methods **/
///@{

2
include/xo/reader2/DProgressSsm.hpp
View file

@ -147,6 +147,8 @@ namespace xo {
ParserStateMachine * p_psm);
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
void on_parsed_expression(obj<AExpression>,
ParserStateMachine * p_psm);
///@{

8
include/xo/reader2/ParserStateMachine.hpp
View file

@ -164,6 +164,14 @@ namespace xo {
TypeDescr td,
std::string_view expect_str);
/** report illegal parsed expression from nested ssm.
* Introducing as placeholder; not clear if this will be reachable
* in full parser
**/
void illegal_parsed_expression(std::string_view ssm_name,
obj<AExpression>,
std::string_view expect_str);
///@}
private:

2
include/xo/reader2/ssm/ASyntaxStateMachine.hpp
View file

@ -75,6 +75,8 @@ public:
virtual void on_parsed_symbol(Opaque data, std::string_view sym, ParserStateMachine * p_psm) = 0;
/** operate state machine for incoming type description @p td **/
virtual void on_parsed_typedescr(Opaque data, TypeDescr td, ParserStateMachine * p_psm) = 0;
/** update state machine for incoming parsed expression @p expr **/
virtual void on_parsed_expression(Opaque data, obj<AExpression> expr, ParserStateMachine * p_psm) = 0;
///@}
}; /*ASyntaxStateMachine*/

1
include/xo/reader2/ssm/ISyntaxStateMachine_Any.hpp
View file

@ -69,6 +69,7 @@ namespace scm {
[[noreturn]] void on_semicolon_token(Opaque, const Token &, ParserStateMachine *) override;
[[noreturn]] void on_parsed_symbol(Opaque, std::string_view, ParserStateMachine *) override;
[[noreturn]] void on_parsed_typedescr(Opaque, TypeDescr, ParserStateMachine *) override;
[[noreturn]] void on_parsed_expression(Opaque, obj<AExpression>, ParserStateMachine *) override;
///@}

2
include/xo/reader2/ssm/ISyntaxStateMachine_DDefineSsm.hpp
View file

@ -72,6 +72,8 @@ namespace xo {
static void on_parsed_symbol(DDefineSsm & self, std::string_view sym, ParserStateMachine * p_psm);
/** operate state machine for incoming type description @p td **/
static void on_parsed_typedescr(DDefineSsm & self, TypeDescr td, ParserStateMachine * p_psm);
/** update state machine for incoming parsed expression @p expr **/
static void on_parsed_expression(DDefineSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
};

2
include/xo/reader2/ssm/ISyntaxStateMachine_DExpectExprSsm.hpp
View file

@ -72,6 +72,8 @@ namespace xo {
static void on_parsed_symbol(DExpectExprSsm & self, std::string_view sym, ParserStateMachine * p_psm);
/** operate state machine for incoming type description @p td **/
static void on_parsed_typedescr(DExpectExprSsm & self, TypeDescr td, ParserStateMachine * p_psm);
/** update state machine for incoming parsed expression @p expr **/
static void on_parsed_expression(DExpectExprSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
};

2
include/xo/reader2/ssm/ISyntaxStateMachine_DExpectSymbolSsm.hpp
View file

@ -72,6 +72,8 @@ namespace xo {
static void on_parsed_symbol(DExpectSymbolSsm & self, std::string_view sym, ParserStateMachine * p_psm);
/** operate state machine for incoming type description @p td **/
static void on_parsed_typedescr(DExpectSymbolSsm & self, TypeDescr td, ParserStateMachine * p_psm);
/** update state machine for incoming parsed expression @p expr **/
static void on_parsed_expression(DExpectSymbolSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
};

2
include/xo/reader2/ssm/ISyntaxStateMachine_DExpectTypeSsm.hpp
View file

@ -72,6 +72,8 @@ namespace xo {
static void on_parsed_symbol(DExpectTypeSsm & self, std::string_view sym, ParserStateMachine * p_psm);
/** operate state machine for incoming type description @p td **/
static void on_parsed_typedescr(DExpectTypeSsm & self, TypeDescr td, ParserStateMachine * p_psm);
/** update state machine for incoming parsed expression @p expr **/
static void on_parsed_expression(DExpectTypeSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
};

2
include/xo/reader2/ssm/ISyntaxStateMachine_DExprSeqState.hpp
View file

@ -72,6 +72,8 @@ namespace xo {
static void on_parsed_symbol(DExprSeqState & self, std::string_view sym, ParserStateMachine * p_psm);
/** operate state machine for incoming type description @p td **/
static void on_parsed_typedescr(DExprSeqState & self, TypeDescr td, ParserStateMachine * p_psm);
/** update state machine for incoming parsed expression @p expr **/
static void on_parsed_expression(DExprSeqState & self, obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
};

2
include/xo/reader2/ssm/ISyntaxStateMachine_DProgressSsm.hpp
View file

@ -72,6 +72,8 @@ namespace xo {
static void on_parsed_symbol(DProgressSsm & self, std::string_view sym, ParserStateMachine * p_psm);
/** operate state machine for incoming type description @p td **/
static void on_parsed_typedescr(DProgressSsm & self, TypeDescr td, ParserStateMachine * p_psm);
/** update state machine for incoming parsed expression @p expr **/
static void on_parsed_expression(DProgressSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm);
///@}
};

3
include/xo/reader2/ssm/ISyntaxStateMachine_Xfer.hpp
View file

@ -79,6 +79,9 @@ namespace scm {
void on_parsed_typedescr(Opaque data, TypeDescr td, ParserStateMachine * p_psm) override {
return I::on_parsed_typedescr(_dcast(data), td, p_psm);
}
void on_parsed_expression(Opaque data, obj<AExpression> expr, ParserStateMachine * p_psm) override {
return I::on_parsed_expression(_dcast(data), expr, p_psm);
}
///@}

3
include/xo/reader2/ssm/RSyntaxStateMachine.hpp
View file

@ -83,6 +83,9 @@ public:
void on_parsed_typedescr(TypeDescr td, ParserStateMachine * p_psm) {
return O::iface()->on_parsed_typedescr(O::data(), td, p_psm);
}
void on_parsed_expression(obj<AExpression> expr, ParserStateMachine * p_psm) {
return O::iface()->on_parsed_expression(O::data(), expr, p_psm);
}
///@}
/** @defgroup scm-syntaxstatemachine-member-vars **/

9
src/reader2/DDefineSsm.cpp
View file

@ -583,6 +583,15 @@ namespace xo {
this->get_expect_str());
}
void
DDefineSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DDefineSsm::on_parsed_expression",
expr,
this->get_expect_str());
}
bool
DDefineSsm::pretty(const ppindentinfo & ppii) const
{

9
src/reader2/DExpectExprSsm.cpp
View file

@ -197,6 +197,15 @@ namespace xo {
this->get_expect_str());
}
void
DExpectExprSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExpectExprSsm::on_parsed_expression",
expr,
this->get_expect_str());
}
bool
DExpectExprSsm::pretty(const ppindentinfo & ppii) const
{

9
src/reader2/DExpectSymbolSsm.cpp
View file

@ -74,6 +74,15 @@ namespace xo {
this->get_expect_str());
}
void
DExpectSymbolSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExpectSymbolSsm::on_parsed_expression",
expr,
this->get_expect_str());
}
void
DExpectSymbolSsm::on_symbol_token(const Token & tk,
ParserStateMachine * p_psm)

9
src/reader2/DExpectTypeSsm.cpp
View file

@ -163,6 +163,15 @@ namespace xo {
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());
}
bool
DExpectTypeSsm::pretty(const ppindentinfo & ppii) const
{

9
src/reader2/DExprSeqState.cpp
View file

@ -214,6 +214,15 @@ namespace xo {
this->get_expect_str());
}
void
DExprSeqState::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DExprSeqState::on_parsed_expression",
expr,
this->get_expect_str());
}
bool
DExprSeqState::pretty(const ppindentinfo & ppii) const
{

9
src/reader2/DProgressSsm.cpp
View file

@ -257,6 +257,15 @@ namespace xo {
this->get_expect_str());
}
void
DProgressSsm::on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm)
{
p_psm->illegal_parsed_expression("DProgressSsm::on_parsed_expression",
expr,
this->get_expect_str());
}
#ifdef NOT_YET
void
progress_xs::apply_type_error(const char * self_name,

6
src/reader2/ISyntaxStateMachine_Any.cpp
View file

@ -88,6 +88,12 @@ ISyntaxStateMachine_Any::on_parsed_typedescr(Opaque, TypeDescr, ParserStateMachi
_fatal();
}
auto
ISyntaxStateMachine_Any::on_parsed_expression(Opaque, obj<AExpression>, ParserStateMachine *) -> void
{
_fatal();
}
} /*namespace scm*/
} /*namespace xo*/

5
src/reader2/ISyntaxStateMachine_DDefineSsm.cpp
View file

@ -72,6 +72,11 @@ namespace xo {
{
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_parsed_expression(DDefineSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
}
} /*namespace scm*/
} /*namespace xo*/

5
src/reader2/ISyntaxStateMachine_DExpectExprSsm.cpp
View file

@ -72,6 +72,11 @@ namespace xo {
{
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectExprSsm::on_parsed_expression(DExpectExprSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
}
} /*namespace scm*/
} /*namespace xo*/

5
src/reader2/ISyntaxStateMachine_DExpectSymbolSsm.cpp
View file

@ -72,6 +72,11 @@ namespace xo {
{
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_parsed_expression(DExpectSymbolSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
}
} /*namespace scm*/
} /*namespace xo*/

5
src/reader2/ISyntaxStateMachine_DExpectTypeSsm.cpp
View file

@ -72,6 +72,11 @@ namespace xo {
{
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_parsed_expression(DExpectTypeSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
}
} /*namespace scm*/
} /*namespace xo*/

5
src/reader2/ISyntaxStateMachine_DExprSeqState.cpp
View file

@ -72,6 +72,11 @@ namespace xo {
{
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_parsed_expression(DExprSeqState & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
}
} /*namespace scm*/
} /*namespace xo*/

5
src/reader2/ISyntaxStateMachine_DProgressSsm.cpp
View file

@ -72,6 +72,11 @@ namespace xo {
{
self.on_parsed_typedescr(td, p_psm);
}
auto
ISyntaxStateMachine_DProgressSsm::on_parsed_expression(DProgressSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
{
self.on_parsed_expression(expr, p_psm);
}
} /*namespace scm*/
} /*namespace xo*/

23
src/reader2/ParserStateMachine.cpp
View file

@ -343,6 +343,29 @@ namespace xo {
this->capture_error(ssm_name, errmsg);
}
void
ParserStateMachine::illegal_parsed_expression(std::string_view ssm_name,
obj<AExpression> expr,
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("expr", expr),
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);
}
} /*namespace scm*/
} /*namespace xo*/