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

xo-reader: rename+: exprstate.on_semicolon() -> on_semicolon_token()

Browse source
This commit is contained in:
Roland Conybeare 2024-08-09 13:16:52 -04:00
commit 544c1def4a
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

@ -62,8 +62,9 @@ namespace xo {
rp<Expression> * /*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<Expression> * /*p_emit_expr*/) override;
virtual void on_semicolon_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_singleassign(exprstatestack * p_stack) override;
virtual void on_leftparen(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;

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

@ -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<Expression> * p_emit_expr);
/** handle incoming ';' token **/
virtual void on_semicolon_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr);
virtual void on_singleassign(exprstatestack * p_stack);
virtual void on_leftparen(exprstatestack * p_stack,
rp<Expression> * p_emit_expr);

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

@ -58,8 +58,9 @@ namespace xo {
rp<Expression> * 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<Expression> * /*p_emit_expr*/) override;
virtual void on_semicolon_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_singleassign(exprstatestack * p_stack) override;
virtual void on_leftparen(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;

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

@ -45,8 +45,9 @@ namespace xo {
rp<Expression> * /*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<Expression> * /*p_emit_expr*/) override;
virtual void on_semicolon_token(const token_type & tk,
exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;
virtual void on_singleassign(exprstatestack * p_stack) override;
virtual void on_leftparen(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override;

5
src/reader/define_xs.cpp
View file

@ -352,8 +352,9 @@ namespace xo {
}
void
define_xs::on_semicolon(exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
define_xs::on_semicolon_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

@ -524,8 +524,9 @@ namespace xo {
}
void
exprstate::on_semicolon(exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
exprstate::on_semicolon_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));
@ -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:

5
src/reader/paren_xs.cpp
View file

@ -119,8 +119,9 @@ namespace xo {
}
void
paren_xs::on_semicolon(exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
paren_xs::on_semicolon_token(const token_type & /*tk*/,
exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
{
constexpr const char * c_self_name = "paren_xs::on_semicolon";

7
src/reader/progress_xs.cpp
View file

@ -93,8 +93,9 @@ namespace xo {
}
void
progress_xs::on_semicolon(exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
progress_xs::on_semicolon_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));
@ -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