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

xo-reader2: top-level string literal + on_string_token() in SSM

Browse source
This commit is contained in:
Roland Conybeare 2026-01-23 17:23:19 -05:00
commit b6ff615057
32 changed files with 189 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xo-reader2/idl/SyntaxStateMachine.json5
View file

@ -117,6 +117,15 @@
{type: "ParserStateMachine *", name: "p_psm"},
],
},
{
name: "on_string_token",
doc: ["update state machine for incoming string-token @p tk"],
return_type: "void",
args: [
{type: "const Token &", name: "tk"},
{type: "ParserStateMachine *", name: "p_psm"},
],
},
{
name: "on_semicolon_token",
doc: ["update state machine for incoming semicolon-token @p tk"],

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

@ -147,6 +147,12 @@ namespace xo {
void on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming string tokne @p tk,
* overall parser state in @p p_psm
**/
void on_string_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming f64 token @p tk,
* overall parser state in @p p_psm
**/

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

@ -83,6 +83,12 @@ namespace xo {
void on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming string token @p tk,
* overall parser state in @p p_psm
**/
void on_string_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming f64 token @p tk,
* overall parser state in @p p_psm
**/

6
xo-reader2/include/xo/reader2/DExpectSymbolSsm.hpp
View file

@ -117,6 +117,12 @@ namespace xo {
void on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming string token @p tk,
* overall parser state in @p p_psm
**/
void on_string_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming f64 token @p tk,
* overall parser state in @p p_psm
**/

6
xo-reader2/include/xo/reader2/DExpectTypeSsm.hpp
View file

@ -77,6 +77,12 @@ namespace xo {
void on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming string token @p tk,
* overall parser state in @p p_psm
**/
void on_string_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming f64 token @p tk,
* overall parser state in @p p_psm
**/

5
xo-reader2/include/xo/reader2/DExprSeqState.hpp
View file

@ -90,6 +90,11 @@ namespace xo {
**/
void on_singleassign_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on incoming string token @p tk,
* overall parser state in @p p_psm
**/
void on_string_token(const Token & tk, ParserStateMachine * p_psm);
/** update state for this syntax on incoming f64 token @p tk,
* overall parser state in @p p_psm
**/

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

@ -141,6 +141,8 @@ namespace xo {
ParserStateMachine * p_psm);
void on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm);
void on_string_token(const Token & tk,
ParserStateMachine * p_psm);
void on_f64_token(const Token & tk,
ParserStateMachine * p_psm);
void on_i64_token(const Token & tk,

3
xo-reader2/include/xo/reader2/ParserStateMachine.hpp
View file

@ -138,6 +138,9 @@ namespace xo {
/** operate state machine for incoming singleassign-token @p tk **/
void on_singleassign_token(const Token & tk);
/** operate state machine for incoming string-otoken @p tk **/
void on_string_token(const Token & tk);
/** operate state machine for incoming f64-token @p tk **/
void on_f64_token(const Token & tk);

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

@ -73,6 +73,8 @@ public:
virtual void on_i64_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) = 0;
/** update state machine for incoming bool-token @p tk **/
virtual void on_bool_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) = 0;
/** update state machine for incoming string-token @p tk **/
virtual void on_string_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) = 0;
/** update state machine for incoming semicolon-token @p tk **/
virtual void on_semicolon_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) = 0;
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -68,6 +68,7 @@ namespace scm {
[[noreturn]] void on_f64_token(Opaque, const Token &, ParserStateMachine *) override;
[[noreturn]] void on_i64_token(Opaque, const Token &, ParserStateMachine *) override;
[[noreturn]] void on_bool_token(Opaque, const Token &, ParserStateMachine *) override;
[[noreturn]] void on_string_token(Opaque, const Token &, ParserStateMachine *) override;
[[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;

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

@ -70,6 +70,8 @@ namespace xo {
static void on_i64_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming bool-token @p tk **/
static void on_bool_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming string-token @p tk **/
static void on_string_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming semicolon-token @p tk **/
static void on_semicolon_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -70,6 +70,8 @@ namespace xo {
static void on_i64_token(DExpectExprSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming bool-token @p tk **/
static void on_bool_token(DExpectExprSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming string-token @p tk **/
static void on_string_token(DExpectExprSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming semicolon-token @p tk **/
static void on_semicolon_token(DExpectExprSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -70,6 +70,8 @@ namespace xo {
static void on_i64_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming bool-token @p tk **/
static void on_bool_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming string-token @p tk **/
static void on_string_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming semicolon-token @p tk **/
static void on_semicolon_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -70,6 +70,8 @@ namespace xo {
static void on_i64_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming bool-token @p tk **/
static void on_bool_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming string-token @p tk **/
static void on_string_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming semicolon-token @p tk **/
static void on_semicolon_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -70,6 +70,8 @@ namespace xo {
static void on_i64_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming bool-token @p tk **/
static void on_bool_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming string-token @p tk **/
static void on_string_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming semicolon-token @p tk **/
static void on_semicolon_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -70,6 +70,8 @@ namespace xo {
static void on_i64_token(DProgressSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming bool-token @p tk **/
static void on_bool_token(DProgressSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming string-token @p tk **/
static void on_string_token(DProgressSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update state machine for incoming semicolon-token @p tk **/
static void on_semicolon_token(DProgressSsm & self, const Token & tk, ParserStateMachine * p_psm);
/** update stat machine for incoming parsed symbol @p sym **/

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

@ -76,6 +76,9 @@ namespace scm {
void on_bool_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) override {
return I::on_bool_token(_dcast(data), tk, p_psm);
}
void on_string_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) override {
return I::on_string_token(_dcast(data), tk, p_psm);
}
void on_semicolon_token(Opaque data, const Token & tk, ParserStateMachine * p_psm) override {
return I::on_semicolon_token(_dcast(data), tk, p_psm);
}

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

@ -80,6 +80,9 @@ public:
void on_bool_token(const Token & tk, ParserStateMachine * p_psm) {
return O::iface()->on_bool_token(O::data(), tk, p_psm);
}
void on_string_token(const Token & tk, ParserStateMachine * p_psm) {
return O::iface()->on_string_token(O::data(), tk, p_psm);
}
void on_semicolon_token(const Token & tk, ParserStateMachine * p_psm) {
return O::iface()->on_semicolon_token(O::data(), tk, p_psm);
}

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

@ -567,6 +567,15 @@ namespace xo {
this->get_expect_str());
}
void
DDefineSsm::on_string_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DDefineSsm::on_string_token",
tk,
this->get_expect_str());
}
void
DDefineSsm::on_f64_token(const Token & tk,
ParserStateMachine * p_psm)

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

@ -147,6 +147,15 @@ namespace xo {
this->get_expect_str());
}
void
DExpectExprSsm::on_string_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectExprSsm::on_string_token",
tk,
this->get_expect_str());
}
void
DExpectExprSsm::on_f64_token(const Token & tk,
ParserStateMachine * p_psm)

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

@ -149,6 +149,15 @@ namespace xo {
this->get_expect_str());
}
void
DExpectSymbolSsm::on_string_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DExpectSymbolSsm::on_string_token",
tk,
this->get_expect_str());
}
void
DExpectSymbolSsm::on_f64_token(const Token & tk,
ParserStateMachine * p_psm)

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

@ -92,6 +92,15 @@ namespace xo {
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)

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

@ -9,6 +9,8 @@
#include <xo/reader2/DProgressSsm.hpp>
#include <xo/expression2/DConstant.hpp>
#include <xo/expression2/detail/IExpression_DConstant.hpp>
#include <xo/object2/DString.hpp>
#include <xo/object2/string/IGCObject_DString.hpp>
#include <xo/object2/DFloat.hpp>
#include <xo/object2/number/IGCObject_DFloat.hpp>
#include <xo/object2/DBoolean.hpp>
@ -192,6 +194,36 @@ namespace xo {
this->get_expect_str());
}
void
DExprSeqState::on_string_token(const Token & tk,
ParserStateMachine * p_psm)
{
switch (seqtype_) {
case exprseqtype::toplevel_interactive:
{
DString * dstr = DString::from_cstr(p_psm->expr_alloc(),
tk.text().c_str());
obj<AGCObject,DString> str(dstr);
auto * dconst = DConstant::make(p_psm->expr_alloc(), str);
obj<AExpression,DConstant> expr(dconst);
DProgressSsm::start(p_psm->parser_alloc(),
expr,
p_psm);
return;
}
case exprseqtype::toplevel_batch:
break;
case exprseqtype::N:
assert(false); // unreachable
break;
}
p_psm->illegal_input_on_token("DExprSeqState::on_string_token",
tk,
this->get_expect_str());
}
void
DExprSeqState::on_f64_token(const Token & tk,
ParserStateMachine * p_psm)

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

@ -203,6 +203,15 @@ namespace xo {
this->get_expect_str());
}
void
DProgressSsm::on_string_token(const Token & tk,
ParserStateMachine * p_psm)
{
p_psm->illegal_input_on_token("DProgressSsm::on_string_token",
tk,
this->get_expect_str());
}
void
DProgressSsm::on_f64_token(const Token & tk,
ParserStateMachine * p_psm)

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

@ -82,6 +82,12 @@ ISyntaxStateMachine_Any::on_bool_token(Opaque, const Token &, ParserStateMachine
_fatal();
}
auto
ISyntaxStateMachine_Any::on_string_token(Opaque, const Token &, ParserStateMachine *) -> void
{
_fatal();
}
auto
ISyntaxStateMachine_Any::on_semicolon_token(Opaque, const Token &, ParserStateMachine *) -> void
{

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

@ -68,6 +68,11 @@ namespace xo {
self.on_bool_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_string_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_string_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DDefineSsm::on_semicolon_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_semicolon_token(tk, p_psm);

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

@ -68,6 +68,11 @@ namespace xo {
self.on_bool_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectExprSsm::on_string_token(DExpectExprSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_string_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectExprSsm::on_semicolon_token(DExpectExprSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_semicolon_token(tk, p_psm);

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

@ -68,6 +68,11 @@ namespace xo {
self.on_bool_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_string_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_string_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectSymbolSsm::on_semicolon_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_semicolon_token(tk, p_psm);

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

@ -68,6 +68,11 @@ namespace xo {
self.on_bool_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_string_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_string_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExpectTypeSsm::on_semicolon_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_semicolon_token(tk, p_psm);

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

@ -68,6 +68,11 @@ namespace xo {
self.on_bool_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_string_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_string_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DExprSeqState::on_semicolon_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_semicolon_token(tk, p_psm);

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

@ -68,6 +68,11 @@ namespace xo {
self.on_bool_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DProgressSsm::on_string_token(DProgressSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_string_token(tk, p_psm);
}
auto
ISyntaxStateMachine_DProgressSsm::on_semicolon_token(DProgressSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
{
self.on_semicolon_token(tk, p_psm);

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

@ -183,6 +183,10 @@ namespace xo {
this->on_singleassign_token(tk);
break;
case tokentype::tk_string:
this->on_string_token(tk);
break;
case tokentype::tk_f64:
this->on_f64_token(tk);
break;
@ -201,7 +205,6 @@ namespace xo {
// all the not-yet handled cases
case tokentype::tk_invalid:
case tokentype::tk_string:
case tokentype::tk_leftparen:
case tokentype::tk_rightparen:
case tokentype::tk_leftbracket:
@ -278,6 +281,14 @@ namespace xo {
stack_->top().on_singleassign_token(tk, this);
}
void
ParserStateMachine::on_string_token(const Token & tk)
{
scope log(XO_DEBUG(debug_flag_), xtag("tk", tk));
stack_->top().on_string_token(tk, this);
}
void
ParserStateMachine::on_f64_token(const Token & tk)
{