xo-reader2: scaffold on_singleassign_token() in PSM

idl/SyntaxStateMachine.json5

@@ -81,6 +81,15 @@
                 {type: "ParserStateMachine *", name: "p_psm"},
             ],
         },
+        {
+            name: "on_singleassign_token",
+            doc: ["update state machine for incoming singleassign-token @p tk"],
+            return_type: "void",
+            args: [
+                {type: "const Token &", name: "tk"},
+                {type: "ParserStateMachine *", name: "p_psm"},
+            ],
+        },
         {
             name: "on_parsed_symbol",
             doc: ["update  stat machine for incoming parsed symbol @p sym"],

include/xo/reader2/DDefineSsm.hpp

@@ -134,6 +134,12 @@ namespace xo {
             void on_colon_token(const Token & tk,
                                 ParserStateMachine * p_psm);
 
+            /** update state for this syntax on incoming singleassign token @p tk,
+             *  overall parser state in @p p_psm
+             **/
+            void on_singleassign_token(const Token & tk,
+                                       ParserStateMachine * p_psm);
+
             /** update state for this syntax after parsing a symbol @p sym;
              *  overall parser state in @p p_psm
              **/

include/xo/reader2/DExpectSymbolSsm.hpp

@@ -97,6 +97,12 @@ namespace xo {
             void on_colon_token(const Token & tk,
                                 ParserStateMachine * p_psm);
 
+            /** update state for this syntax on incoming singleassign token @p tk,
+             *  overall parser state in @p p_psm
+             **/
+            void on_singleassign_token(const Token & tk,
+                                       ParserStateMachine * p_psm);
+
             ///@}
             /** @defgroup scm-expectsymbol-printable-facet printable facet methods **/
             ///@{

include/xo/reader2/DExpectTypeSsm.hpp

@@ -71,6 +71,12 @@ namespace xo {
             void on_colon_token(const Token & tk,
                                 ParserStateMachine * p_psm);
 
+            /** operate state machine for this syntax on incoming singleassign-token @p tk
+             *  with overall parser state in @p p_psm
+             **/
+            void on_singleassign_token(const Token & tk,
+                                       ParserStateMachine * p_psm);
+
             /** (Never called).
              *  Operate state machine for this syntax after symbol
              *  emitted from nested ssm.

include/xo/reader2/DExprSeqState.hpp

@@ -85,6 +85,11 @@ namespace xo {
              **/
             void on_colon_token(const Token & tk, ParserStateMachine * p_psm);
 
+            /** update state for this syntax on incoming single-assign token @p tk,
+             *  overall parser state in @p p_psm
+             **/
+            void on_singleassign_token(const Token & tk, ParserStateMachine * p_psm);
+
             /** update state for this syntax on parsed symbol @p sym
              *  from immediately-downstream ssm.
              *  overall parser state in @p p_psm

include/xo/reader2/ParserStateMachine.hpp

@@ -116,6 +116,9 @@ namespace xo {
             /** operate state machine for incoming colon-token @p tk **/
             void on_colon_token(const Token & tk);
 
+            /** operate state machine for incoming singleassign-token @p tk **/
+            void on_singleassign_token(const Token & tk);
+
             ///@}
             /** @defgroup scm-parserstatemachine-error-entrypoints error entry points **/
             ///@{

include/xo/reader2/ssm/ASyntaxStateMachine.hpp

@@ -65,6 +65,8 @@ public:
     virtual void on_if_token(Opaque data, const Token & tk, ParserStateMachine * p_psm)  = 0;
     /** update state machine for incoming colon-token @p tk **/
     virtual void on_colon_token(Opaque data, const Token & tk, ParserStateMachine * p_psm)  = 0;
+    /** update state machine for incoming singleassign-token @p tk **/
+    virtual void on_singleassign_token(Opaque data, const Token & tk, ParserStateMachine * p_psm)  = 0;
     /** update  stat machine for incoming parsed symbol @p sym **/
     virtual void on_parsed_symbol(Opaque data, std::string_view sym, ParserStateMachine * p_psm)  = 0;
     /** operate state machine for incoming type description @p td **/

include/xo/reader2/ssm/ISyntaxStateMachine_Any.hpp

@@ -64,6 +64,7 @@ namespace scm {
         [[noreturn]] void on_def_token(Opaque, const Token &, ParserStateMachine *)  override;
         [[noreturn]] void on_if_token(Opaque, const Token &, ParserStateMachine *)  override;
         [[noreturn]] void on_colon_token(Opaque, const Token &, ParserStateMachine *)  override;
+        [[noreturn]] void on_singleassign_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;
 

include/xo/reader2/ssm/ISyntaxStateMachine_DDefineSsm.hpp

@@ -62,6 +62,8 @@ namespace xo {
             static void on_if_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
             /** update state machine for incoming colon-token @p tk **/
             static void on_colon_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
+            /** update state machine for incoming singleassign-token @p tk **/
+            static void on_singleassign_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm);
             /** update  stat machine for incoming parsed symbol @p sym **/
             static void on_parsed_symbol(DDefineSsm & self, std::string_view sym, ParserStateMachine * p_psm);
             /** operate state machine for incoming type description @p td **/

include/xo/reader2/ssm/ISyntaxStateMachine_DExpectSymbolSsm.hpp

@@ -62,6 +62,8 @@ namespace xo {
             static void on_if_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
             /** update state machine for incoming colon-token @p tk **/
             static void on_colon_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
+            /** update state machine for incoming singleassign-token @p tk **/
+            static void on_singleassign_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm);
             /** update  stat machine for incoming parsed symbol @p sym **/
             static void on_parsed_symbol(DExpectSymbolSsm & self, std::string_view sym, ParserStateMachine * p_psm);
             /** operate state machine for incoming type description @p td **/

include/xo/reader2/ssm/ISyntaxStateMachine_DExpectTypeSsm.hpp

@@ -62,6 +62,8 @@ namespace xo {
             static void on_if_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
             /** update state machine for incoming colon-token @p tk **/
             static void on_colon_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
+            /** update state machine for incoming singleassign-token @p tk **/
+            static void on_singleassign_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm);
             /** update  stat machine for incoming parsed symbol @p sym **/
             static void on_parsed_symbol(DExpectTypeSsm & self, std::string_view sym, ParserStateMachine * p_psm);
             /** operate state machine for incoming type description @p td **/

include/xo/reader2/ssm/ISyntaxStateMachine_DExprSeqState.hpp

@@ -62,6 +62,8 @@ namespace xo {
             static void on_if_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
             /** update state machine for incoming colon-token @p tk **/
             static void on_colon_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
+            /** update state machine for incoming singleassign-token @p tk **/
+            static void on_singleassign_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm);
             /** update  stat machine for incoming parsed symbol @p sym **/
             static void on_parsed_symbol(DExprSeqState & self, std::string_view sym, ParserStateMachine * p_psm);
             /** operate state machine for incoming type description @p td **/

include/xo/reader2/ssm/ISyntaxStateMachine_Xfer.hpp

@@ -64,6 +64,9 @@ namespace scm {
         void on_colon_token(Opaque data, const Token & tk, ParserStateMachine * p_psm)  override {
             return I::on_colon_token(_dcast(data), tk, p_psm);
         }
+        void on_singleassign_token(Opaque data, const Token & tk, ParserStateMachine * p_psm)  override {
+            return I::on_singleassign_token(_dcast(data), tk, p_psm);
+        }
         void on_parsed_symbol(Opaque data, std::string_view sym, ParserStateMachine * p_psm)  override {
             return I::on_parsed_symbol(_dcast(data), sym, p_psm);
         }

include/xo/reader2/ssm/RSyntaxStateMachine.hpp

@@ -68,6 +68,9 @@ public:
     void on_colon_token(const Token & tk, ParserStateMachine * p_psm)  {
         return O::iface()->on_colon_token(O::data(), tk, p_psm);
     }
+    void on_singleassign_token(const Token & tk, ParserStateMachine * p_psm)  {
+        return O::iface()->on_singleassign_token(O::data(), tk, p_psm);
+    }
     void on_parsed_symbol(std::string_view sym, ParserStateMachine * p_psm)  {
         return O::iface()->on_parsed_symbol(O::data(), sym, p_psm);
     }

src/reader2/DDefineSsm.cpp

@@ -543,6 +543,28 @@ namespace xo {
                                           this->get_expect_str());
         }
 
+        void
+        DDefineSsm::on_singleassign_token(const Token & tk,
+                                          ParserStateMachine * p_psm)
+        {
+            scope log(XO_DEBUG(true), xtag("defstate", defstate_));
+
+            if ((defstate_ == defexprstatetype::def_2)
+                || (defstate_ == defexprstatetype::def_4))
+            {
+                this->defstate_ = defexprstatetype::def_5;
+
+                // TODO: DExpectExprSsm::start(...)
+                log && log("STUB: DExpectExprSsm not implemented");
+
+                return;
+            }
+
+            p_psm->illegal_input_on_token("DDefineSsm::on_singleassign_token",
+                                          tk,
+                                          this->get_expect_str());
+        }
+
         bool
         DDefineSsm::pretty(const ppindentinfo & ppii) const
         {

src/reader2/DExpectSymbolSsm.cpp

@@ -122,6 +122,15 @@ namespace xo {
                                           this->get_expect_str());
         }
 
+        void
+        DExpectSymbolSsm::on_singleassign_token(const Token & tk,
+                                                ParserStateMachine * p_psm)
+        {
+            p_psm->illegal_input_on_token("DExpectSymbolSsm::on_singleassign_token",
+                                          tk,
+                                          this->get_expect_str());
+        }
+
         bool
         DExpectSymbolSsm::pretty(const ppindentinfo & ppii) const
         {

src/reader2/DExpectTypeSsm.cpp

@@ -83,6 +83,15 @@ namespace xo {
                                           this->get_expect_str());
         }
 
+        void
+        DExpectTypeSsm::on_singleassign_token(const Token & tk,
+                                              ParserStateMachine * p_psm)
+        {
+            p_psm->illegal_input_on_token("DExpectTypeSsm::on_singleassign_token",
+                                          tk,
+                                          this->get_expect_str());
+        }
+
         void
         DExpectTypeSsm::on_symbol_token(const Token & tk,
                                         ParserStateMachine * p_psm)

src/reader2/DExprSeqState.cpp

@@ -169,6 +169,15 @@ namespace xo {
                                           this->get_expect_str());
         }
 
+        void
+        DExprSeqState::on_singleassign_token(const Token & tk,
+                                             ParserStateMachine * p_psm)
+        {
+            p_psm->illegal_input_on_token("DExprSeqState::on_singleassign_token",
+                                          tk,
+                                          this->get_expect_str());
+        }
+
         void
         DExprSeqState::on_parsed_symbol(std::string_view sym,
                                         ParserStateMachine * p_psm)

src/reader2/ISyntaxStateMachine_Any.cpp

@@ -58,6 +58,12 @@ ISyntaxStateMachine_Any::on_colon_token(Opaque, const Token &, ParserStateMachin
     _fatal();
 }
 
+auto
+ISyntaxStateMachine_Any::on_singleassign_token(Opaque, const Token &, ParserStateMachine *)  -> void
+{
+    _fatal();
+}
+
 auto
 ISyntaxStateMachine_Any::on_parsed_symbol(Opaque, std::string_view, ParserStateMachine *)  -> void
 {

src/reader2/ISyntaxStateMachine_DDefineSsm.cpp

@@ -48,6 +48,11 @@ namespace xo {
             self.on_colon_token(tk, p_psm);
         }
         auto
+        ISyntaxStateMachine_DDefineSsm::on_singleassign_token(DDefineSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_singleassign_token(tk, p_psm);
+        }
+        auto
         ISyntaxStateMachine_DDefineSsm::on_parsed_symbol(DDefineSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
         {
             self.on_parsed_symbol(sym, p_psm);

src/reader2/ISyntaxStateMachine_DExpectSymbolSsm.cpp

@@ -48,6 +48,11 @@ namespace xo {
             self.on_colon_token(tk, p_psm);
         }
         auto
+        ISyntaxStateMachine_DExpectSymbolSsm::on_singleassign_token(DExpectSymbolSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_singleassign_token(tk, p_psm);
+        }
+        auto
         ISyntaxStateMachine_DExpectSymbolSsm::on_parsed_symbol(DExpectSymbolSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
         {
             self.on_parsed_symbol(sym, p_psm);

src/reader2/ISyntaxStateMachine_DExpectTypeSsm.cpp

@@ -48,6 +48,11 @@ namespace xo {
             self.on_colon_token(tk, p_psm);
         }
         auto
+        ISyntaxStateMachine_DExpectTypeSsm::on_singleassign_token(DExpectTypeSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_singleassign_token(tk, p_psm);
+        }
+        auto
         ISyntaxStateMachine_DExpectTypeSsm::on_parsed_symbol(DExpectTypeSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
         {
             self.on_parsed_symbol(sym, p_psm);

src/reader2/ISyntaxStateMachine_DExprSeqState.cpp

@@ -48,6 +48,11 @@ namespace xo {
             self.on_colon_token(tk, p_psm);
         }
         auto
+        ISyntaxStateMachine_DExprSeqState::on_singleassign_token(DExprSeqState & self, const Token & tk, ParserStateMachine * p_psm) -> void
+        {
+            self.on_singleassign_token(tk, p_psm);
+        }
+        auto
         ISyntaxStateMachine_DExprSeqState::on_parsed_symbol(DExprSeqState & self, std::string_view sym, ParserStateMachine * p_psm) -> void
         {
             self.on_parsed_symbol(sym, p_psm);

src/reader2/ParserStateMachine.cpp

@@ -153,6 +153,10 @@ namespace xo {
                 this->on_colon_token(tk);
                 break;
 
+            case tokentype::tk_singleassign:
+                this->on_singleassign_token(tk);
+                break;
+
             // all the not-yet handled cases
             case tokentype::tk_invalid:
             case tokentype::tk_bool:
@@ -173,7 +177,6 @@ namespace xo {
             case tokentype::tk_comma:
             case tokentype::tk_doublecolon:
             case tokentype::tk_semicolon:
-            case tokentype::tk_singleassign:
             case tokentype::tk_assign:
             case tokentype::tk_yields:
             case tokentype::tk_plus:
@@ -229,6 +232,14 @@ namespace xo {
             stack_->top().on_colon_token(tk, this);
         }
 
+        void
+        ParserStateMachine::on_singleassign_token(const Token & tk)
+        {
+            scope log(XO_DEBUG(debug_flag_), xtag("tk", tk));
+
+            stack_->top().on_singleassign_token(tk, this);
+        }
+
         void
         ParserStateMachine::capture_error(std::string_view ssm_name,
                                           const DString * errmsg)