From 8d1ae35075891fea9f2d372bc97b1f5c68e08cfd Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 9 Aug 2024 13:25:59 -0400 Subject: [PATCH] xo-reader: rename+: exprstate.on_leftparen() -> on_leftparen_token() --- include/xo/reader/define_xs.hpp | 5 +++-- include/xo/reader/exprstate.hpp | 4 +++- 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 | 5 +++-- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/include/xo/reader/define_xs.hpp b/include/xo/reader/define_xs.hpp index e90abf9f..bf12e566 100644 --- a/include/xo/reader/define_xs.hpp +++ b/include/xo/reader/define_xs.hpp @@ -67,8 +67,9 @@ namespace xo { rp * /*p_emit_expr*/) override; virtual void on_singleassign_token(const token_type & tk, exprstatestack * p_stack) override; - virtual void on_leftparen(exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_leftparen_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void on_rightparen(exprstatestack * p_stack, rp * /*p_emit_expr*/) override; virtual void on_f64(const token_type & tk, diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp index f8921dc9..0a41e5a0 100644 --- a/include/xo/reader/exprstate.hpp +++ b/include/xo/reader/exprstate.hpp @@ -141,7 +141,9 @@ namespace xo { /** handle incoming '=' token **/ virtual void on_singleassign_token(const token_type & tk, exprstatestack * p_stack); - virtual void on_leftparen(exprstatestack * p_stack, + /** handle incoming '(' token **/ + virtual void on_leftparen_token(const token_type & tk, + exprstatestack * p_stack, rp * p_emit_expr); virtual void on_rightparen(exprstatestack * p_stack, rp * p_emit_expr); diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp index 821fef13..9a9dba83 100644 --- a/include/xo/reader/paren_xs.hpp +++ b/include/xo/reader/paren_xs.hpp @@ -63,8 +63,9 @@ namespace xo { rp * /*p_emit_expr*/) override; virtual void on_singleassign_token(const token_type & tk, exprstatestack * p_stack) override; - virtual void on_leftparen(exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_leftparen_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void on_rightparen(exprstatestack * p_stack, rp * /*p_emit_expr*/) override; virtual void on_f64(const token_type & tk, diff --git a/include/xo/reader/progress_xs.hpp b/include/xo/reader/progress_xs.hpp index 431ad0fd..a2e8da6c 100644 --- a/include/xo/reader/progress_xs.hpp +++ b/include/xo/reader/progress_xs.hpp @@ -50,8 +50,9 @@ namespace xo { rp * /*p_emit_expr*/) override; virtual void on_singleassign_token(const token_type & tk, exprstatestack * p_stack) override; - virtual void on_leftparen(exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_leftparen_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void on_rightparen(exprstatestack * p_stack, rp * /*p_emit_expr*/) override; virtual void on_f64(const token_type & tk, diff --git a/src/reader/define_xs.cpp b/src/reader/define_xs.cpp index be531be3..3373c0a7 100644 --- a/src/reader/define_xs.cpp +++ b/src/reader/define_xs.cpp @@ -409,8 +409,9 @@ namespace xo { } void - define_xs::on_leftparen(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + define_xs::on_leftparen_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 236bc895..3c53bf74 100644 --- a/src/reader/exprstate.cpp +++ b/src/reader/exprstate.cpp @@ -562,8 +562,9 @@ namespace xo { } void - exprstate::on_leftparen(exprstatestack * p_stack, - rp * /*p_emit_expr*/) + exprstate::on_leftparen_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)); @@ -670,7 +671,7 @@ namespace xo { return; case tokentype::tk_leftparen: - this->on_leftparen(p_stack, p_emit_expr); + this->on_leftparen_token(tk, p_stack, p_emit_expr); return; case tokentype::tk_rightparen: diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp index 8b7ee84d..afa96b47 100644 --- a/src/reader/paren_xs.cpp +++ b/src/reader/paren_xs.cpp @@ -142,8 +142,9 @@ namespace xo { } void - paren_xs::on_leftparen(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + paren_xs::on_leftparen_token(const token_type & /*tk*/, + exprstatestack * /*p_stack*/, + rp * /*p_emit_expr*/) { constexpr const char * c_self_name = "paren_xs::on_leftparen"; diff --git a/src/reader/progress_xs.cpp b/src/reader/progress_xs.cpp index d8ab19d8..0118132c 100644 --- a/src/reader/progress_xs.cpp +++ b/src/reader/progress_xs.cpp @@ -137,8 +137,9 @@ namespace xo { } void - progress_xs::on_leftparen(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + progress_xs::on_leftparen_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));