roland/xo-reader2
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 4d0c97ab7a
32 changed files with 189 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
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
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
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
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
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
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
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
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
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
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
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
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
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
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)
{