xo-reader2 stack: + #q token + QuoteSsm [WIP - not functional]

src/reader2/CMakeLists.txt

@@ -69,6 +69,9 @@ set(SELF_SRCS
     ISyntaxStateMachine_DProgressSsm.cpp
     IPrintable_DProgressSsm.cpp
 
+    DQuoteSsm.cpp
+    ISyntaxStateMachine_DQuoteSsm.cpp
+    IPrintable_DQuoteSsm.cpp
     )
 
 xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})

src/reader2/DApplySsm.cpp

@@ -150,6 +150,7 @@ namespace xo {
             case tokentype::tk_i64:
             case tokentype::tk_bool:
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftbrace:

src/reader2/DDefineSsm.cpp

@@ -531,6 +531,7 @@ namespace xo {
             case tokentype::tk_i64:
             case tokentype::tk_bool:
             case tokentype::tk_if:
+            case tokentype::tk_quote:
             case tokentype::tk_leftparen:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:

src/reader2/DExpectExprSsm.cpp

@@ -169,6 +169,7 @@ namespace xo {
             case tokentype::tk_singleassign:
             case tokentype::tk_colon:
             case tokentype::tk_semicolon:
+            case tokentype::tk_quote:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
             case tokentype::tk_rightbrace:

src/reader2/DExpectFormalArgSsm.cpp

@@ -114,6 +114,7 @@ namespace xo {
             case tokentype::tk_bool:
             case tokentype::tk_semicolon:
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftbrace:

src/reader2/DExpectFormalArglistSsm.cpp

@@ -145,6 +145,7 @@ namespace xo {
             case tokentype::tk_bool:
             case tokentype::tk_semicolon:
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftbrace:

src/reader2/DExpectSymbolSsm.cpp

@@ -78,6 +78,7 @@ namespace xo {
             case tokentype::tk_singleassign:
             case tokentype::tk_colon:
             case tokentype::tk_semicolon:
+            case tokentype::tk_quote:
             case tokentype::tk_leftparen:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:

src/reader2/DExpectTypeSsm.cpp

@@ -78,6 +78,7 @@ namespace xo {
             case tokentype::tk_i64:
             case tokentype::tk_bool:
             case tokentype::tk_string:
+            case tokentype::tk_quote:
             case tokentype::tk_leftparen:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:

src/reader2/DIfElseSsm.cpp

@@ -167,6 +167,7 @@ namespace xo {
             case tokentype::tk_i64:
             case tokentype::tk_bool:
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_leftparen:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:

src/reader2/DLambdaSsm.cpp

@@ -154,6 +154,7 @@ namespace xo {
             case tokentype::tk_bool:
             case tokentype::tk_semicolon:
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_leftparen:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:

src/reader2/DParenSsm.cpp

@@ -111,6 +111,7 @@ namespace xo {
             case tokentype::tk_i64:
             case tokentype::tk_bool:
             case tokentype::tk_if:
+            case tokentype::tk_quote:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftbrace:

src/reader2/DProgressSsm.cpp

@@ -285,6 +285,7 @@ namespace xo {
             case tokentype::tk_invalid:
             case tokentype::tk_def:
             case tokentype::tk_if:
+            case tokentype::tk_quote:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftbrace:

src/reader2/DQuoteSsm.cpp

@@ -0,0 +1,218 @@
+/** @file DQuoterSsm.cpp
+ *
+ *  @author Roland Conybeare, Mar 2026
+ **/
+
+#include "QuoteSsm.hpp"
+#include "ExpectExprSsm.hpp"
+#include "syntaxstatetype.hpp"
+//#include <string_view>
+
+namespace xo {
+    using xo::facet::with_facet;
+    using xo::facet::typeseq;
+
+    namespace scm {
+
+        extern const char *
+        QuoteXst::_descr(enum QuoteXst::code x)
+        {
+            switch(x) {
+            case code::invalid: return "invalid";
+            case code::quote_0: return "quote_0";
+            case code::quote_1: return "quote_1";
+            case code::quote_2: return "quote_2";
+            case code::quote_3: return "quote_3";
+            case code::N: break;
+            }
+
+            return "?QuoteXst";
+        }
+
+        DQuoteSsm::DQuoteSsm()
+            : quote_xst_(QuoteXst::code::quote_0),
+              expr_{}
+        {}
+
+        DQuoteSsm *
+        DQuoteSsm::_make(DArena & mm)
+        {
+            void * mem = mm.alloc_for<DQuoteSsm>();
+
+            return new (mem) DQuoteSsm();
+        }
+
+        obj<ASyntaxStateMachine,DQuoteSsm>
+        DQuoteSsm::make(DArena & mm)
+        {
+            return obj<ASyntaxStateMachine,DQuoteSsm>(_make(mm));
+        }
+
+        void
+        DQuoteSsm::start(ParserStateMachine * p_psm)
+        {
+            DArena::Checkpoint ckp = p_psm->parser_alloc().checkpoint();
+
+            auto paren_ssm = DQuoteSsm::make(p_psm->parser_alloc());
+
+            p_psm->push_ssm(ckp, paren_ssm);
+        }
+
+        syntaxstatetype
+        DQuoteSsm::ssm_type() const noexcept
+        {
+            return syntaxstatetype::paren;
+        }
+
+        std::string_view
+        DQuoteSsm::get_expect_str() const noexcept
+        {
+            switch (this->quote_xst_.code()) {
+            case QuoteXst::code::invalid:
+            case QuoteXst::code::N:
+                break;
+            case QuoteXst::code::quote_0: return "#q";
+            case QuoteXst::code::quote_1: return "leftbrace";
+            case QuoteXst::code::quote_2: return "qliteral";
+            case QuoteXst::code::quote_3: return "rightbrace";
+            }
+
+            assert(false);
+
+            return "?quotexst";
+        }
+
+        void
+        DQuoteSsm::on_token(const Token & tk,
+                            ParserStateMachine * p_psm)
+        {
+            switch (tk.tk_type()) {
+
+            case tokentype::tk_leftbrace:
+                this->on_leftbrace_token(tk, p_psm);
+                return;
+
+            case tokentype::tk_rightbrace:
+                this->on_rightbrace_token(tk, p_psm);
+                return;
+
+            // all the not-yet handled cases
+            case tokentype::tk_symbol:
+            case tokentype::tk_def:
+            case tokentype::tk_colon:
+            case tokentype::tk_singleassign:
+            case tokentype::tk_semicolon:
+            case tokentype::tk_invalid:
+            case tokentype::tk_string:
+            case tokentype::tk_f64:
+            case tokentype::tk_i64:
+            case tokentype::tk_bool:
+            case tokentype::tk_if:
+            case tokentype::tk_quote:
+            case tokentype::tk_leftparen:
+            case tokentype::tk_rightparen:
+            case tokentype::tk_leftbracket:
+            case tokentype::tk_rightbracket:
+            case tokentype::tk_leftangle:
+            case tokentype::tk_rightangle:
+            case tokentype::tk_lessequal:
+            case tokentype::tk_greatequal:
+            case tokentype::tk_dot:
+            case tokentype::tk_comma:
+            case tokentype::tk_doublecolon:
+            case tokentype::tk_assign:
+            case tokentype::tk_yields:
+            case tokentype::tk_plus:
+            case tokentype::tk_minus:
+            case tokentype::tk_star:
+            case tokentype::tk_slash:
+            case tokentype::tk_cmpeq:
+            case tokentype::tk_cmpne:
+            case tokentype::tk_type:
+            case tokentype::tk_lambda:
+            case tokentype::tk_then:
+            case tokentype::tk_else:
+            case tokentype::tk_let:
+            case tokentype::tk_in:
+            case tokentype::tk_end:
+            case tokentype::N:
+                break;
+            }
+
+            Super::on_token(tk, p_psm);
+        }
+
+        void
+        DQuoteSsm::on_leftbrace_token(const Token & tk,
+                                      ParserStateMachine * p_psm)
+        {
+            if (quote_xst_.code() == QuoteXst::code::quote_0) {
+                this->quote_xst_ = QuoteXst(QuoteXst::code::quote_1);
+
+                assert(false);
+                //DExpectQLiteralSsm::start(p_psm);
+                //return;
+            }
+
+            Super::on_token(tk, p_psm);
+        }
+
+        void
+        DQuoteSsm::on_rightbrace_token(const Token & tk,
+                                       ParserStateMachine * p_psm)
+        {
+            if (quote_xst_.code() == QuoteXst::code::quote_3) {
+                // quoted literal (reported as constant expr) successfully parsed
+
+                p_psm->pop_ssm();
+                p_psm->on_parsed_expression(this->expr_);
+                return;
+            }
+
+            Super::on_token(tk, p_psm);
+        }
+
+        void
+        DQuoteSsm::on_parsed_expression(obj<AExpression> expr,
+                                        ParserStateMachine * p_psm)
+        {
+            if (quote_xst_.code() == QuoteXst::code::quote_2) {
+                this->quote_xst_ = QuoteXst(QuoteXst::code::quote_3);
+                this->expr_ = expr;
+
+                return;
+            }
+
+            Super::on_parsed_expression(expr, p_psm);
+        }
+
+        void
+        DQuoteSsm::on_parsed_expression_with_token(obj<AExpression> expr,
+                                                   const Token & tk,
+                                                   ParserStateMachine * p_psm)
+        {
+            if (quote_xst_.code() == QuoteXst::code::quote_2) {
+                this->quote_xst_ = QuoteXst(QuoteXst::code::quote_3);
+                this->expr_ = expr;
+
+                this->on_token(tk, p_psm);
+
+                return;
+            }
+
+            Super::on_parsed_expression(expr, p_psm);
+        }
+
+        bool
+        DQuoteSsm::pretty(const ppindentinfo & ppii) const
+        {
+            return ppii.pps()->pretty_struct(ppii,
+                                             "DParenSsm",
+                                             refrtag("quote_xst", quote_xst_),
+                                             refrtag("expect", this->get_expect_str()));
+        }
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end DQuoteSsm.cpp */

src/reader2/DSequenceSsm.cpp

@@ -92,6 +92,7 @@ namespace xo {
             case tokentype::tk_bool:
             case tokentype::tk_semicolon:
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_leftparen:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:

src/reader2/DToplevelSeqSsm.cpp

@@ -162,6 +162,7 @@ namespace xo {
 
             // all the not-yet handled cases
             case tokentype::tk_invalid:
+            case tokentype::tk_quote:
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:

src/reader2/IPrintable_DQuoteSsm.cpp

@@ -0,0 +1,28 @@
+/** @file IPrintable_DQuoteSsm.cpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/IPrintable_DQuoteSsm.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_any.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/IPrintable_DQuoteSsm.json5]
+**/
+
+#include "ssm/IPrintable_DQuoteSsm.hpp"
+
+namespace xo {
+    namespace scm {
+        auto
+        IPrintable_DQuoteSsm::pretty(const DQuoteSsm & self, const ppindentinfo & ppii) -> bool
+        {
+            return self.pretty(ppii);
+        }
+
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end IPrintable_DQuoteSsm.cpp */

src/reader2/ISyntaxStateMachine_DQuoteSsm.cpp

@@ -0,0 +1,74 @@
+/** @file ISyntaxStateMachine_DQuoteSsm.cpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/ISyntaxStateMachine_DQuoteSsm.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_any.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/ISyntaxStateMachine_DQuoteSsm.json5]
+**/
+
+#include "ssm/ISyntaxStateMachine_DQuoteSsm.hpp"
+
+namespace xo {
+    namespace scm {
+        auto
+        ISyntaxStateMachine_DQuoteSsm::ssm_type(const DQuoteSsm & self) noexcept -> syntaxstatetype
+        {
+            return self.ssm_type();
+        }
+
+        auto
+        ISyntaxStateMachine_DQuoteSsm::get_expect_str(const DQuoteSsm & self) noexcept -> std::string_view
+        {
+            return self.get_expect_str();
+        }
+
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_token(DQuoteSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_token(tk, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_symbol(DQuoteSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_symbol(sym, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_typedescr(DQuoteSsm & self, TypeDescr td, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_typedescr(td, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_formal(DQuoteSsm & self, const DUniqueString * param_name, TypeDescr param_type, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_formal(param_name, param_type, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_formal_with_token(DQuoteSsm & self, const DUniqueString * param_name, TypeDescr param_type, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_formal_with_token(param_name, param_type, tk, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_formal_arglist(DQuoteSsm & self, DArray * arglist, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_formal_arglist(arglist, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_expression(DQuoteSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_expression(expr, p_psm);
+        }
+        auto
+        ISyntaxStateMachine_DQuoteSsm::on_parsed_expression_with_token(DQuoteSsm & self, obj<AExpression> expr, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_parsed_expression_with_token(expr, tk, p_psm);
+        }
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end ISyntaxStateMachine_DQuoteSsm.cpp */

src/reader2/syntaxstatetype.cpp

@@ -27,6 +27,8 @@ namespace xo {
                 return "progress";
             case syntaxstatetype::paren:
                 return "paren";
+            case syntaxstatetype::quote:
+                return "quote";
             case syntaxstatetype::expect_toplevel_expression_sequence:
                 return "expect-toplevel-expression-sequence";
             case syntaxstatetype::expect_formal_arglist: