From 4f44bada3dd971927396a3a4568827a812c9c42a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 11 Aug 2024 00:02:29 -0500 Subject: [PATCH] xo-reader: tidy - bury debris --- include/xo/reader/exprstate.hpp | 5 ----- src/reader/exprstate.cpp | 38 --------------------------------- 2 files changed, 43 deletions(-) diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp index 8cb278e7..dc62e86f 100644 --- a/include/xo/reader/exprstate.hpp +++ b/include/xo/reader/exprstate.hpp @@ -72,11 +72,6 @@ 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 **/ diff --git a/src/reader/exprstate.cpp b/src/reader/exprstate.cpp index c3b85833..f38f3540 100644 --- a/src/reader/exprstate.cpp +++ b/src/reader/exprstate.cpp @@ -5,9 +5,7 @@ #include "progress_xs.hpp" #include "paren_xs.hpp" #include "expect_expr_xs.hpp" -//#include "xo/expression/DefineExpr.hpp" #include "xo/expression/Constant.hpp" -//#include "xo/expression/ConvertExpr.hpp" #include "xo/reflect/Reflect.hpp" namespace xo { @@ -42,42 +40,6 @@ namespace xo { return "???"; } -#ifdef OBSOLETE - bool - exprstate::admits_symbol() const { - switch (exs_type_) { - case exprstatetype::expect_toplevel_expression_sequence: - return false; - - case exprstatetype::defexpr: - case exprstatetype::parenexpr: - case exprstatetype::expect_rhs_expression: - /* unreachable */ - assert(false); - return false; - - case exprstatetype::expect_symbol: - return true; - - case exprstatetype::expect_type: - /* treat symbol as typename */ - return true; - - case exprstatetype::expr_progress: - /* unreachable */ - assert(false); - return false; - - case exprstatetype::invalid: - case exprstatetype::n_exprstatetype: - /* unreachable */ - return false; - } - - return false; - } -#endif - void exprstate::on_def_token(const token_type & tk, exprstatestack * /*p_stack*/)