From ae746b31736209674d265b8fb565f02ff3591ed2 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 11 Aug 2024 00:01:11 -0500
Subject: [PATCH] xo-reader: retire unused admits_symbol()

---
 include/xo/reader/define_xs.hpp   |  5 +----
 include/xo/reader/exprstate.hpp   |  6 +++++-
 include/xo/reader/paren_xs.hpp    |  2 --
 include/xo/reader/progress_xs.hpp |  5 -----
 src/reader/define_xs.cpp          | 22 ----------------------
 src/reader/exprstate.cpp          |  2 ++
 src/reader/paren_xs.cpp           |  3 ---
 src/reader/progress_xs.cpp        |  3 ---
 8 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/include/xo/reader/define_xs.hpp b/include/xo/reader/define_xs.hpp
index d00b2d79..f3a5f15a 100644
--- a/include/xo/reader/define_xs.hpp
+++ b/include/xo/reader/define_xs.hpp
@@ -46,10 +46,7 @@ namespace xo {
             bool admits_colon() const;
             bool admits_semicolon() const;
 
-            virtual bool admits_symbol() const override;
-#ifdef OBSOLETE
-            bool admits_singleassign() const;
-#endif
+            //bool admits_symbol() const;
 
             // virtual void on_f64(..) override
             virtual void on_expr(ref::brw<Expression> expr,
diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp
index 9f6e46d2..8cb278e7 100644
--- a/include/xo/reader/exprstate.hpp
+++ b/include/xo/reader/exprstate.hpp
@@ -72,13 +72,17 @@ namespace xo {
 
             exprstatetype exs_type() const { return exs_type_; }
 
+#ifdef OBSOLETE
             /** true iff this parsing state admits a symbol as next token **/
             virtual bool admits_symbol() const;
+#endif
 
             /** update exprstate in response to incoming token @p tk,
              *  forward instructions to parent parser
              **/
-            void on_input(const token_type & tk, exprstatestack * p_stack, rp<Expression> * p_emit_expr);
+            void on_input(const token_type & tk,
+                          exprstatestack * p_stack,
+                          rp<Expression> * p_emit_expr);
 
             /** update exprstate in response to a successfully-parsed subexpression **/
             virtual void on_expr(ref::brw<Expression> expr,
diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp
index 3f4922de..65811607 100644
--- a/include/xo/reader/paren_xs.hpp
+++ b/include/xo/reader/paren_xs.hpp
@@ -34,8 +34,6 @@ namespace xo {
             bool admits_f64() const;
             bool admits_rightparen() const;
 
-            virtual bool admits_symbol() const override;
-
             virtual void on_expr(ref::brw<Expression> expr,
                                  exprstatestack * p_stack,
                                  rp<Expression> * p_emit_expr) override;
diff --git a/include/xo/reader/progress_xs.hpp b/include/xo/reader/progress_xs.hpp
index 93e442e3..361e6d3d 100644
--- a/include/xo/reader/progress_xs.hpp
+++ b/include/xo/reader/progress_xs.hpp
@@ -24,11 +24,6 @@ namespace xo {
 
             bool admits_f64() const;
 
-            virtual bool admits_symbol() const override;
-#ifdef OBSOLETE
-            bool admits_singleassign() const;
-#endif
-
             virtual void on_expr(ref::brw<Expression> expr,
                                  exprstatestack * p_stack,
                                  rp<Expression> * p_emit_expr) override;
diff --git a/src/reader/define_xs.cpp b/src/reader/define_xs.cpp
index d901f3fb..d3c2d5c2 100644
--- a/src/reader/define_xs.cpp
+++ b/src/reader/define_xs.cpp
@@ -17,28 +17,6 @@ namespace xo {
               def_expr_{std::move(def_expr)}
         {}
 
-        bool
-        define_xs::admits_symbol() const {
-            switch (defxs_type_) {
-
-            case defexprstatetype::def_0:
-            case defexprstatetype::def_1:
-            case defexprstatetype::def_2:
-            case defexprstatetype::def_3:
-            case defexprstatetype::def_4:
-            case defexprstatetype::def_5:
-                return false;
-
-            case defexprstatetype::invalid:
-            case defexprstatetype::n_defexprstatetype:
-                /* unreachable */
-                assert(false);
-                return false;
-            }
-
-            return false;
-        }
-
         bool
         define_xs::admits_colon() const {
             switch (defxs_type_) {
diff --git a/src/reader/exprstate.cpp b/src/reader/exprstate.cpp
index ce33737d..c3b85833 100644
--- a/src/reader/exprstate.cpp
+++ b/src/reader/exprstate.cpp
@@ -42,6 +42,7 @@ namespace xo {
             return "???";
         }
 
+#ifdef OBSOLETE
         bool
         exprstate::admits_symbol() const {
             switch (exs_type_) {
@@ -75,6 +76,7 @@ namespace xo {
 
             return false;
         }
+#endif
 
         void
         exprstate::on_def_token(const token_type & tk,
diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp
index 304babb6..cfd20f95 100644
--- a/src/reader/paren_xs.cpp
+++ b/src/reader/paren_xs.cpp
@@ -14,9 +14,6 @@ namespace xo {
             return std::make_unique<paren_xs>(paren_xs());
         }
 
-        bool
-        paren_xs::admits_symbol() const { return true; }
-
         bool
         paren_xs::admits_rightparen() const {
             switch (parenxs_type_) {
diff --git a/src/reader/progress_xs.cpp b/src/reader/progress_xs.cpp
index 077450eb..4d78fb8a 100644
--- a/src/reader/progress_xs.cpp
+++ b/src/reader/progress_xs.cpp
@@ -14,9 +14,6 @@ namespace xo {
               gen_expr_{std::move(valex)}
         {}
 
-        bool
-        progress_xs::admits_symbol() const { return false; }
-
         bool
         progress_xs::admits_f64() const { return false; }