From 544c1def4a00fc6a8a759b0e58e28f97ceb77a25 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 9 Aug 2024 13:16:52 -0400 Subject: [PATCH] xo-reader: rename+: exprstate.on_semicolon() -> on_semicolon_token() --- include/xo/reader/define_xs.hpp | 5 +++-- include/xo/reader/exprstate.hpp | 6 ++++-- include/xo/reader/paren_xs.hpp | 5 +++-- include/xo/reader/progress_xs.hpp | 5 +++-- src/reader/define_xs.cpp | 5 +++-- src/reader/exprstate.cpp | 7 ++++--- src/reader/paren_xs.cpp | 5 +++-- src/reader/progress_xs.cpp | 7 ++++--- 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/include/xo/reader/define_xs.hpp b/include/xo/reader/define_xs.hpp index bee7d24f..b90cde31 100644 --- a/include/xo/reader/define_xs.hpp +++ b/include/xo/reader/define_xs.hpp @@ -62,8 +62,9 @@ namespace xo { rp * /*p_emit_expr*/) override; virtual void on_colon_token(const token_type & tk, exprstatestack * p_stack) override; - virtual void on_semicolon(exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_semicolon_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void on_singleassign(exprstatestack * p_stack) override; virtual void on_leftparen(exprstatestack * p_stack, rp * /*p_emit_expr*/) override; diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp index 2f0c9e6a..c7a419d3 100644 --- a/include/xo/reader/exprstate.hpp +++ b/include/xo/reader/exprstate.hpp @@ -134,8 +134,10 @@ namespace xo { /** handle incoming ':' token **/ virtual void on_colon_token(const token_type & tk, exprstatestack * p_stack); - virtual void on_semicolon(exprstatestack * p_stack, - rp * p_emit_expr); + /** handle incoming ';' token **/ + virtual void on_semicolon_token(const token_type & tk, + exprstatestack * p_stack, + rp * p_emit_expr); virtual void on_singleassign(exprstatestack * p_stack); virtual void on_leftparen(exprstatestack * p_stack, rp * p_emit_expr); diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp index fa63f212..ed2ad87b 100644 --- a/include/xo/reader/paren_xs.hpp +++ b/include/xo/reader/paren_xs.hpp @@ -58,8 +58,9 @@ namespace xo { rp * p_emit_expr) override; virtual void on_colon_token(const token_type & tk, exprstatestack * p_stack) override; - virtual void on_semicolon(exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_semicolon_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void on_singleassign(exprstatestack * p_stack) override; virtual void on_leftparen(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 e0e2c7db..a6d3d508 100644 --- a/include/xo/reader/progress_xs.hpp +++ b/include/xo/reader/progress_xs.hpp @@ -45,8 +45,9 @@ namespace xo { rp * /*p_emit_expr*/) override; virtual void on_colon_token(const token_type & tk, exprstatestack * p_stack) override; - virtual void on_semicolon(exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_semicolon_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void on_singleassign(exprstatestack * p_stack) override; virtual void on_leftparen(exprstatestack * p_stack, rp * /*p_emit_expr*/) override; diff --git a/src/reader/define_xs.cpp b/src/reader/define_xs.cpp index 82081331..512a214b 100644 --- a/src/reader/define_xs.cpp +++ b/src/reader/define_xs.cpp @@ -352,8 +352,9 @@ namespace xo { } void - define_xs::on_semicolon(exprstatestack * p_stack, - rp * p_emit_expr) + define_xs::on_semicolon_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/exprstate.cpp b/src/reader/exprstate.cpp index bb8c1a18..9902e75e 100644 --- a/src/reader/exprstate.cpp +++ b/src/reader/exprstate.cpp @@ -524,8 +524,9 @@ namespace xo { } void - exprstate::on_semicolon(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + exprstate::on_semicolon_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)); @@ -696,7 +697,7 @@ namespace xo { return; case tokentype::tk_semicolon: - this->on_semicolon(p_stack, p_emit_expr); + this->on_semicolon_token(tk, p_stack, p_emit_expr); return; case tokentype::tk_singleassign: diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp index ebc07527..f8ae4f17 100644 --- a/src/reader/paren_xs.cpp +++ b/src/reader/paren_xs.cpp @@ -119,8 +119,9 @@ namespace xo { } void - paren_xs::on_semicolon(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + paren_xs::on_semicolon_token(const token_type & /*tk*/, + exprstatestack * /*p_stack*/, + rp * /*p_emit_expr*/) { constexpr const char * c_self_name = "paren_xs::on_semicolon"; diff --git a/src/reader/progress_xs.cpp b/src/reader/progress_xs.cpp index 32964064..59df672a 100644 --- a/src/reader/progress_xs.cpp +++ b/src/reader/progress_xs.cpp @@ -93,8 +93,9 @@ namespace xo { } void - progress_xs::on_semicolon(exprstatestack * p_stack, - rp * p_emit_expr) + progress_xs::on_semicolon_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)); @@ -121,7 +122,7 @@ namespace xo { * f. now deliver semicolon; [lparen_1] rejects */ - p_stack->top_exprstate().on_semicolon(p_stack, p_emit_expr); + p_stack->top_exprstate().on_semicolon_token(tk, p_stack, p_emit_expr); } void