roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-reader: retire unused admits_symbol()

Browse source
This commit is contained in:
Roland Conybeare 2024-08-11 00:01:11 -05:00
commit ae746b3173
8 changed files with 8 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/xo/reader/define_xs.hpp
View file

@ -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,

6
include/xo/reader/exprstate.hpp
View file

@ -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,

2
include/xo/reader/paren_xs.hpp
View file

@ -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;

5
include/xo/reader/progress_xs.hpp
View file

@ -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;

22
src/reader/define_xs.cpp
View file

@ -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_) {

2
src/reader/exprstate.cpp
View file

@ -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,

3
src/reader/paren_xs.cpp
View file

@ -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_) {

3
src/reader/progress_xs.cpp
View file

@ -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; }