From a51f1d65dbc003fa804906c19986065c23c33d59 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 9 Aug 2024 13:30:41 -0400 Subject: [PATCH] xo-reader: rename+: exprstate.on_rightparen() + token arg --- 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 bf12e566..87871ac9 100644 --- a/include/xo/reader/define_xs.hpp +++ b/include/xo/reader/define_xs.hpp @@ -70,8 +70,9 @@ namespace xo { 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_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; diff --git a/include/xo/reader/exprstate.hpp b/include/xo/reader/exprstate.hpp index 0a41e5a0..820ec9d3 100644 --- a/include/xo/reader/exprstate.hpp +++ b/include/xo/reader/exprstate.hpp @@ -145,8 +145,10 @@ namespace xo { 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); + /** handle incoming ')' token **/ + 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); diff --git a/include/xo/reader/paren_xs.hpp b/include/xo/reader/paren_xs.hpp index 9a9dba83..ce646bfb 100644 --- a/include/xo/reader/paren_xs.hpp +++ b/include/xo/reader/paren_xs.hpp @@ -66,8 +66,9 @@ namespace xo { 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_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; diff --git a/include/xo/reader/progress_xs.hpp b/include/xo/reader/progress_xs.hpp index a2e8da6c..0d36a0b3 100644 --- a/include/xo/reader/progress_xs.hpp +++ b/include/xo/reader/progress_xs.hpp @@ -53,8 +53,9 @@ namespace xo { 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_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; diff --git a/src/reader/define_xs.cpp b/src/reader/define_xs.cpp index 3373c0a7..dba2118a 100644 --- a/src/reader/define_xs.cpp +++ b/src/reader/define_xs.cpp @@ -429,8 +429,9 @@ namespace xo { } void - define_xs::on_rightparen(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + define_xs::on_rightparen_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 3c53bf74..d625a758 100644 --- a/src/reader/exprstate.cpp +++ b/src/reader/exprstate.cpp @@ -586,8 +586,9 @@ namespace xo { } void - exprstate::on_rightparen(exprstatestack * /*p_stack*/, - rp * /*p_emit_expr*/) + exprstate::on_rightparen_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)); @@ -675,7 +676,7 @@ namespace xo { return; case tokentype::tk_rightparen: - this->on_rightparen(p_stack, p_emit_expr); + this->on_rightparen_token(tk, p_stack, p_emit_expr); return; case tokentype::tk_leftbracket: diff --git a/src/reader/paren_xs.cpp b/src/reader/paren_xs.cpp index afa96b47..2b92419e 100644 --- a/src/reader/paren_xs.cpp +++ b/src/reader/paren_xs.cpp @@ -154,8 +154,9 @@ namespace xo { } void - paren_xs::on_rightparen(exprstatestack * p_stack, - rp * p_emit_expr) + paren_xs::on_rightparen_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 0118132c..f2ccf0ea 100644 --- a/src/reader/progress_xs.cpp +++ b/src/reader/progress_xs.cpp @@ -152,8 +152,9 @@ namespace xo { } void - progress_xs::on_rightparen(exprstatestack * p_stack, - rp * p_emit_expr) + progress_xs::on_rightparen_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)); @@ -186,7 +187,7 @@ namespace xo { p_stack->top_exprstate().on_expr(expr, p_stack, p_emit_expr); /* now deliver rightparen */ - p_stack->top_exprstate().on_rightparen(p_stack, p_emit_expr); + p_stack->top_exprstate().on_rightparen_token(tk, p_stack, p_emit_expr); }