xo-reader: simplify: drop redundant virtual admits_xxx()

include/xo/reader/define_xs.hpp

@@ -44,9 +44,9 @@ namespace xo {
 
             bool admits_rightparen() const;
             bool admits_colon() const;
+            bool admits_semicolon() const;
 
             virtual bool admits_symbol() const override;
-            virtual bool admits_semicolon() const override;
             virtual bool admits_singleassign() const override;
 
             // virtual void on_f64(..) override

include/xo/reader/exprstate.hpp

@@ -74,8 +74,10 @@ namespace xo {
 
             /** true iff this parsing state admits a symbol as next token **/
             virtual bool admits_symbol() const;
+#ifdef OBSOLETE
             /** true iff this parsing state admits a semicolon as next token **/
             virtual bool admits_semicolon() const;
+#endif
             /** true iff this parsing state admits a singleassign '=' as next token **/
             virtual bool admits_singleassign() const;
 

include/xo/reader/paren_xs.hpp

@@ -35,7 +35,6 @@ namespace xo {
             bool admits_rightparen() const;
 
             virtual bool admits_symbol() const override;
-            virtual bool admits_semicolon() const override;
             virtual bool admits_singleassign() const override;
 
             virtual void on_expr(ref::brw<Expression> expr,

include/xo/reader/progress_xs.hpp

@@ -25,12 +25,7 @@ namespace xo {
             bool admits_f64() const;
 
             virtual bool admits_symbol() const override;
-            virtual bool admits_semicolon() const override;
             virtual bool admits_singleassign() const override;
-#ifdef OBSOLETE
-            virtual bool admits_leftparen() const override;
-            virtual bool admits_rightparen() const override;
-#endif
 
             virtual void on_expr(ref::brw<Expression> expr,
                                  exprstatestack * p_stack,

src/reader/exprstate.cpp

@@ -76,6 +76,7 @@ namespace xo {
             return false;
         }
 
+#ifdef OBSOLETE
         bool
         exprstate::admits_semicolon() const {
             switch (exs_type_) {
@@ -97,6 +98,7 @@ namespace xo {
 
             return false;
         }
+#endif
 
         bool
         exprstate::admits_singleassign() const {
@@ -202,14 +204,9 @@ namespace xo {
 
             constexpr const char * self_name = "exprstate::on_semicolon";
 
-            if (!this->admits_semicolon())
+            throw std::runtime_error(tostr(self_name,
-            {
+                                           ": unexpected semicolon for parsing state",
-                throw std::runtime_error(tostr(self_name,
+                                           xtag("state", *this)));
-                                               ": unexpected semicolon for parsing state",
-                                               xtag("state", *this)));
-            }
-
-            assert(false);
         }
 
         void

src/reader/paren_xs.cpp

@@ -17,9 +17,6 @@ namespace xo {
         bool
         paren_xs::admits_symbol() const { return true; }
 
-        bool
-        paren_xs::admits_semicolon() const { return false; }
-
         bool
         paren_xs::admits_singleassign() const { return false; }
 

src/reader/progress_xs.cpp

@@ -17,20 +17,14 @@ namespace xo {
         bool
         progress_xs::admits_symbol() const { return false; }
 
+#ifdef OSBOLETE
         bool
         progress_xs::admits_semicolon() const { return true; }
+#endif
 
         bool
         progress_xs::admits_singleassign() const { return false; }
 
-#ifdef OBSOLETE
-        bool
-        progress_xs::admits_rightparen() const {
-            /* satisfies expression form */
-            return true;
-        }
-#endif
-
         bool
         progress_xs::admits_f64() const { return false; }