From 2cff2b5ca78ad3e99781cf6b75c8a07b1c987f06 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 9 Aug 2024 13:21:18 -0400
Subject: [PATCH] xo-reader: rename+: exprstate.on_singleassign() + explicit
 token

---
 include/xo/reader/define_xs.hpp   | 3 ++-
 include/xo/reader/exprstate.hpp   | 4 +++-
 include/xo/reader/paren_xs.hpp    | 3 ++-
 include/xo/reader/progress_xs.hpp | 3 ++-
 src/reader/define_xs.cpp          | 3 ++-
 src/reader/exprstate.cpp          | 5 +++--
 src/reader/paren_xs.cpp           | 3 ++-
 src/reader/progress_xs.cpp        | 4 +++-
 8 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/include/xo/reader/define_xs.hpp b/include/xo/reader/define_xs.hpp
index b90cde31..e90abf9f 100644
--- a/include/xo/reader/define_xs.hpp
+++ b/include/xo/reader/define_xs.hpp
@@ -65,7 +65,8 @@ namespace xo {
             virtual void on_semicolon_token(const token_type & tk,
                                             exprstatestack * p_stack,
                                             rp<Expression> * /*p_emit_expr*/) override;
-            virtual void on_singleassign(exprstatestack * p_stack) override;
+            virtual void on_singleassign_token(const token_type & tk,
+                                               exprstatestack * p_stack) override;
             virtual void on_leftparen(exprstatestack * p_stack,
                                       rp<Expression> * /*p_emit_expr*/) override;
             virtual void on_rightparen(exprstatestack * p_stack,
diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp
index c7a419d3..f8921dc9 100644
--- a/include/xo/reader/exprstate.hpp
+++ b/include/xo/reader/exprstate.hpp
@@ -138,7 +138,9 @@ namespace xo {
             virtual void on_semicolon_token(const token_type & tk,
                                             exprstatestack * p_stack,
                                             rp<Expression> * p_emit_expr);
-            virtual void on_singleassign(exprstatestack * p_stack);
+            /** handle incoming '=' token **/
+            virtual void on_singleassign_token(const token_type & tk,
+                                               exprstatestack * p_stack);
             virtual void on_leftparen(exprstatestack * p_stack,
                                       rp<Expression> * p_emit_expr);
             virtual void on_rightparen(exprstatestack * p_stack,
diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp
index ed2ad87b..821fef13 100644
--- a/include/xo/reader/paren_xs.hpp
+++ b/include/xo/reader/paren_xs.hpp
@@ -61,7 +61,8 @@ namespace xo {
             virtual void on_semicolon_token(const token_type & tk,
                                             exprstatestack * p_stack,
                                             rp<Expression> * /*p_emit_expr*/) override;
-            virtual void on_singleassign(exprstatestack * p_stack) override;
+            virtual void on_singleassign_token(const token_type & tk,
+                                               exprstatestack * p_stack) override;
             virtual void on_leftparen(exprstatestack * p_stack,
                                       rp<Expression> * /*p_emit_expr*/) override;
             virtual void on_rightparen(exprstatestack * p_stack,
diff --git a/include/xo/reader/progress_xs.hpp b/include/xo/reader/progress_xs.hpp
index a6d3d508..431ad0fd 100644
--- a/include/xo/reader/progress_xs.hpp
+++ b/include/xo/reader/progress_xs.hpp
@@ -48,7 +48,8 @@ namespace xo {
             virtual void on_semicolon_token(const token_type & tk,
                                             exprstatestack * p_stack,
                                             rp<Expression> * /*p_emit_expr*/) override;
-            virtual void on_singleassign(exprstatestack * p_stack) override;
+            virtual void on_singleassign_token(const token_type & tk,
+                                               exprstatestack * p_stack) override;
             virtual void on_leftparen(exprstatestack * p_stack,
                                       rp<Expression> * /*p_emit_expr*/) override;
             virtual void on_rightparen(exprstatestack * p_stack,
diff --git a/src/reader/define_xs.cpp b/src/reader/define_xs.cpp
index 512a214b..be531be3 100644
--- a/src/reader/define_xs.cpp
+++ b/src/reader/define_xs.cpp
@@ -382,7 +382,8 @@ namespace xo {
         }
 
         void
-        define_xs::on_singleassign(exprstatestack * p_stack)
+        define_xs::on_singleassign_token(const token_type & /*tk*/,
+                                         exprstatestack * p_stack)
         {
             constexpr bool c_debug_flag = true;
             scope log(XO_DEBUG(c_debug_flag));
diff --git a/src/reader/exprstate.cpp b/src/reader/exprstate.cpp
index 9902e75e..236bc895 100644
--- a/src/reader/exprstate.cpp
+++ b/src/reader/exprstate.cpp
@@ -544,7 +544,8 @@ namespace xo {
         }
 
         void
-        exprstate::on_singleassign(exprstatestack * /*p_stack*/) {
+        exprstate::on_singleassign_token(const token_type & /*tk*/,
+                                         exprstatestack * /*p_stack*/) {
             constexpr bool c_debug_flag = true;
             scope log(XO_DEBUG(c_debug_flag));
 
@@ -701,7 +702,7 @@ namespace xo {
                 return;
 
             case tokentype::tk_singleassign:
-                this->on_singleassign(p_stack);
+                this->on_singleassign_token(tk, p_stack);
                 return;
 
             case tokentype::tk_assign:
diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp
index f8ae4f17..8b7ee84d 100644
--- a/src/reader/paren_xs.cpp
+++ b/src/reader/paren_xs.cpp
@@ -131,7 +131,8 @@ namespace xo {
         }
 
         void
-        paren_xs::on_singleassign(exprstatestack * /*p_stack*/)
+        paren_xs::on_singleassign_token(const token_type & /*tk*/,
+                                        exprstatestack * /*p_stack*/)
         {
             constexpr const char * c_self_name = "paren_xs::on_singleassign";
 
diff --git a/src/reader/progress_xs.cpp b/src/reader/progress_xs.cpp
index 59df672a..d8ab19d8 100644
--- a/src/reader/progress_xs.cpp
+++ b/src/reader/progress_xs.cpp
@@ -126,7 +126,9 @@ namespace xo {
         }
 
         void
-        progress_xs::on_singleassign(exprstatestack * /*p_stack*/) {
+        progress_xs::on_singleassign_token(const token_type & /*tk*/,
+                                           exprstatestack * /*p_stack*/)
+        {
             constexpr const char * self_name = "progress_xs::on_singleassign";
 
             throw std::runtime_error(tostr(self_name,