From 49cb0f0bba2c4975289fe759c3807515b459c7cb Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 9 Aug 2024 13:06:34 -0400 Subject: [PATCH] xo-reader: tidy: rename expstate.on_symbol() -> on_symbol_token() --- include/xo/reader/exprstate.hpp | 21 ++++++++++++++++----- include/xo/reader/paren_xs.hpp | 6 +++--- include/xo/reader/progress_xs.hpp | 6 +++--- src/reader/exprstate.cpp | 8 ++++---- src/reader/paren_xs.cpp | 6 +++--- src/reader/progress_xs.cpp | 6 +++--- 6 files changed, 32 insertions(+), 21 deletions(-) diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp index ced48160..6e2f5481 100644 --- a/include/xo/reader/exprstate.hpp +++ b/include/xo/reader/exprstate.hpp @@ -18,15 +18,24 @@ namespace xo { /** toplevel of some translation unit **/ expect_toplevel_expression_sequence, + /** handle define-expression + * see @ref define_xs + **/ defexpr, - /* handle parenthesized expression */ + /** handle parenthesized expression + * see @ref paren_xs + **/ parenexpr, expect_rhs_expression, expect_symbol, expect_type, + /** handle expression-in-progress, + * in case infix operators to follow + * see @ref progress_xs + **/ expr_progress, n_exprstatetype @@ -115,11 +124,13 @@ namespace xo { /** print human-readable representation on @p os **/ virtual void print(std::ostream & os) const; - public: + // ----- input methods ----- + virtual void on_def(exprstatestack * p_stack); - virtual void on_symbol(const token_type & tk, - exprstatestack * p_stack, - rp * p_emit_expr); + /** handle incoming symbol token **/ + virtual void on_symbol_token(const token_type & tk, + exprstatestack * p_stack, + rp * p_emit_expr); virtual void on_colon(exprstatestack * p_stack); virtual void on_semicolon(exprstatestack * p_stack, rp * p_emit_expr); diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp index 91d4a633..964b8dc3 100644 --- a/include/xo/reader/paren_xs.hpp +++ b/include/xo/reader/paren_xs.hpp @@ -53,9 +53,9 @@ namespace xo { exprstatestack * /*p_stack*/, rp * /*p_emit_expr*/) override; - virtual void on_symbol(const token_type & tk, - exprstatestack * p_stack, - rp * p_emit_expr) override; + virtual void on_symbol_token(const token_type & tk, + exprstatestack * p_stack, + rp * p_emit_expr) override; virtual void on_colon(exprstatestack * p_stack) override; virtual void on_semicolon(exprstatestack * p_stack, rp * /*p_emit_expr*/) override; diff --git a/include/xo/reader/progress_xs.hpp b/include/xo/reader/progress_xs.hpp index 62fba624..7d6a25f1 100644 --- a/include/xo/reader/progress_xs.hpp +++ b/include/xo/reader/progress_xs.hpp @@ -37,9 +37,9 @@ namespace xo { virtual void on_expr(ref::brw expr, exprstatestack * p_stack, rp * p_emit_expr) override; - virtual void on_symbol(const token_type & tk, - exprstatestack * p_stack, - rp * p_emit_expr) override; + virtual void on_symbol_token(const token_type & tk, + exprstatestack * p_stack, + rp * p_emit_expr) override; virtual void on_typedescr(TypeDescr td, exprstatestack * /*p_stack*/, rp * /*p_emit_expr*/) override; diff --git a/src/reader/exprstate.cpp b/src/reader/exprstate.cpp index 351fbf5a..b83cad6a 100644 --- a/src/reader/exprstate.cpp +++ b/src/reader/exprstate.cpp @@ -348,9 +348,9 @@ namespace xo { } void - exprstate::on_symbol(const token_type & tk, - exprstatestack * p_stack, - rp * p_emit_expr) + exprstate::on_symbol_token(const token_type & tk, + exprstatestack * p_stack, + rp * p_emit_expr) { constexpr bool c_debug_flag = true; scope log(XO_DEBUG(c_debug_flag)); @@ -662,7 +662,7 @@ namespace xo { return; case tokentype::tk_symbol: - this->on_symbol(tk, p_stack, p_emit_expr); + this->on_symbol_token(tk, p_stack, p_emit_expr); return; case tokentype::tk_leftparen: diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp index e3d41fc9..f9ed033c 100644 --- a/src/reader/paren_xs.cpp +++ b/src/reader/paren_xs.cpp @@ -82,9 +82,9 @@ namespace xo { } void - paren_xs::on_symbol(const token_type & /*tk*/, - exprstatestack * p_stack, - rp * /*p_emit_expr*/) + paren_xs::on_symbol_token(const token_type & /*tk*/, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) { constexpr bool c_debug_flag = true; scope log(XO_DEBUG(c_debug_flag)); diff --git a/src/reader/progress_xs.cpp b/src/reader/progress_xs.cpp index 2070e909..7ac56de5 100644 --- a/src/reader/progress_xs.cpp +++ b/src/reader/progress_xs.cpp @@ -62,9 +62,9 @@ namespace xo { } void - progress_xs::on_symbol(const token_type & /*tk*/, - exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + progress_xs::on_symbol_token(const token_type & /*tk*/, + exprstatestack * /*p_stack*/, + rp * /*p_emit_expr*/) { /* illegal input, e.g. * foo bar