From 892b332a20ca090f36d77f80f6d1a89982e211de Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 9 Aug 2024 13:36:33 -0400 Subject: [PATCH] xo-reader: rename: exprstate.on_f64() -> on_f64_token() --- include/xo/reader/define_xs.hpp | 6 +++--- include/xo/reader/exprstate.hpp | 7 ++++--- include/xo/reader/paren_xs.hpp | 6 +++--- include/xo/reader/progress_xs.hpp | 6 +++--- src/reader/define_xs.cpp | 6 +++--- src/reader/exprstate.cpp | 8 ++++---- src/reader/paren_xs.cpp | 6 +++--- src/reader/progress_xs.cpp | 6 +++--- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/include/xo/reader/define_xs.hpp b/include/xo/reader/define_xs.hpp index 87871ac9..10d53459 100644 --- a/include/xo/reader/define_xs.hpp +++ b/include/xo/reader/define_xs.hpp @@ -73,9 +73,9 @@ namespace xo { virtual void on_rightparen_token(const token_type & tk, exprstatestack * p_stack, rp * /*p_emit_expr*/) override; - virtual void on_f64(const token_type & tk, - exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_f64_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void print(std::ostream & os) const override; diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp index 820ec9d3..943b70bc 100644 --- a/include/xo/reader/exprstate.hpp +++ b/include/xo/reader/exprstate.hpp @@ -149,9 +149,10 @@ namespace xo { virtual void on_rightparen_token(const token_type & tk, exprstatestack * p_stack, rp * p_emit_expr); - virtual void on_f64(const token_type & tk, - exprstatestack * p_stack, - rp * p_emit_expr); + /** handle incoming floating-point-literal token **/ + virtual void on_f64_token(const token_type & tk, + exprstatestack * p_stack, + rp * p_emit_expr); protected: /** explicit subtype: identifies derived class **/ diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp index ce646bfb..8bf137b5 100644 --- a/include/xo/reader/paren_xs.hpp +++ b/include/xo/reader/paren_xs.hpp @@ -69,9 +69,9 @@ namespace xo { virtual void on_rightparen_token(const token_type & tk, exprstatestack * p_stack, rp * /*p_emit_expr*/) override; - virtual void on_f64(const token_type & tk, - exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_f64_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void print(std::ostream & os) const override; diff --git a/include/xo/reader/progress_xs.hpp b/include/xo/reader/progress_xs.hpp index 0d36a0b3..3203a274 100644 --- a/include/xo/reader/progress_xs.hpp +++ b/include/xo/reader/progress_xs.hpp @@ -56,9 +56,9 @@ namespace xo { virtual void on_rightparen_token(const token_type & tk, exprstatestack * p_stack, rp * /*p_emit_expr*/) override; - virtual void on_f64(const token_type & tk, - exprstatestack * p_stack, - rp * /*p_emit_expr*/) override; + virtual void on_f64_token(const token_type & tk, + exprstatestack * p_stack, + rp * /*p_emit_expr*/) override; virtual void print(std::ostream & os) const override; diff --git a/src/reader/define_xs.cpp b/src/reader/define_xs.cpp index dba2118a..d7bccf82 100644 --- a/src/reader/define_xs.cpp +++ b/src/reader/define_xs.cpp @@ -449,9 +449,9 @@ namespace xo { } void - define_xs::on_f64(const token_type & /*tk*/, - exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + define_xs::on_f64_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 d625a758..1a33a503 100644 --- a/src/reader/exprstate.cpp +++ b/src/reader/exprstate.cpp @@ -610,9 +610,9 @@ namespace xo { } void - exprstate::on_f64(const token_type & tk, - exprstatestack * p_stack, - rp * /*p_emit_expr*/) + exprstate::on_f64_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)); @@ -660,7 +660,7 @@ namespace xo { return; case tokentype::tk_f64: - this->on_f64(tk, p_stack, p_emit_expr); + this->on_f64_token(tk, p_stack, p_emit_expr); return; case tokentype::tk_string: diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp index 2b92419e..5446cccb 100644 --- a/src/reader/paren_xs.cpp +++ b/src/reader/paren_xs.cpp @@ -180,9 +180,9 @@ namespace xo { } void - paren_xs::on_f64(const token_type & /*tk*/, - exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + paren_xs::on_f64_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 f2ccf0ea..bb51cf02 100644 --- a/src/reader/progress_xs.cpp +++ b/src/reader/progress_xs.cpp @@ -192,9 +192,9 @@ namespace xo { } void - progress_xs::on_f64(const token_type & /*tk*/, - exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + progress_xs::on_f64_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));