roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-reader: rename+: exprstate.on_rightparen() + token arg

Browse source
This commit is contained in:
Roland Conybeare 2024-08-09 13:30:41 -04:00
commit a51f1d65db
8 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/xo/reader/define_xs.hpp
View file

@ -70,8 +70,9 @@ namespace xo {
virtual void on_leftparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_rightparen(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_rightparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_f64(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;

6
include/xo/reader/exprstate.hpp
View file

@ -145,8 +145,10 @@ namespace xo {
virtual void on_leftparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr);
virtual void on_rightparen(exprstatestack * p_stack,
rp<Expression> * p_emit_expr);
/** handle incoming ')' token **/
virtual void on_rightparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr);
virtual void on_f64(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr);

5
include/xo/reader/paren_xs.hpp
View file

@ -66,8 +66,9 @@ namespace xo {
virtual void on_leftparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_rightparen(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_rightparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_f64(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;

5
include/xo/reader/progress_xs.hpp
View file

@ -53,8 +53,9 @@ namespace xo {
virtual void on_leftparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_rightparen(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_rightparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_f64(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;

5
src/reader/define_xs.cpp
View file

@ -429,8 +429,9 @@ namespace xo {
}
void
define_xs::on_rightparen(exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
define_xs::on_rightparen_token(const token_type & /*tk*/,
exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));

7
src/reader/exprstate.cpp
View file

@ -586,8 +586,9 @@ namespace xo {
}
void
exprstate::on_rightparen(exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
exprstate::on_rightparen_token(const token_type & /*tk*/,
exprstatestack * /*p_stack*/,
rp<Expression> * /*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:

5
src/reader/paren_xs.cpp
View file

@ -154,8 +154,9 @@ namespace xo {
}
void
paren_xs::on_rightparen(exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
paren_xs::on_rightparen_token(const token_type & /*tk*/,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));

7
src/reader/progress_xs.cpp
View file

@ -152,8 +152,9 @@ namespace xo {
}
void
progress_xs::on_rightparen(exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
progress_xs::on_rightparen_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * 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);
}