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

xo-reader: refactor: rename exprstate.on_colon() -> on_colon_token

Browse source
This commit is contained in:
Roland Conybeare 2024-08-09 13:12:01 -04:00
commit 1fcac9485b
8 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,8 @@ namespace xo {
virtual void on_typedescr(TypeDescr td, virtual void on_typedescr(TypeDescr td,
exprstatestack * /*p_stack*/, exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/) override; rp<Expression> * /*p_emit_expr*/) override;
virtual void on_colon(exprstatestack * p_stack) override; virtual void on_colon_token(const token_type & tk,
exprstatestack * p_stack) override;
virtual void on_semicolon(exprstatestack * p_stack, virtual void on_semicolon(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override; rp<Expression> * /*p_emit_expr*/) override;
virtual void on_singleassign(exprstatestack * p_stack) override; virtual void on_singleassign(exprstatestack * p_stack) override;

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

@ -131,7 +131,9 @@ namespace xo {
virtual void on_symbol_token(const token_type & tk, virtual void on_symbol_token(const token_type & tk,
exprstatestack * p_stack, exprstatestack * p_stack,
rp<Expression> * p_emit_expr); rp<Expression> * p_emit_expr);
virtual void on_colon(exprstatestack * p_stack); /** handle incoming ':' token **/
virtual void on_colon_token(const token_type & tk,
exprstatestack * p_stack);
virtual void on_semicolon(exprstatestack * p_stack, virtual void on_semicolon(exprstatestack * p_stack,
rp<Expression> * p_emit_expr); rp<Expression> * p_emit_expr);
virtual void on_singleassign(exprstatestack * p_stack); virtual void on_singleassign(exprstatestack * p_stack);

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

@ -56,7 +56,8 @@ namespace xo {
virtual void on_symbol_token(const token_type & tk, virtual void on_symbol_token(const token_type & tk,
exprstatestack * p_stack, exprstatestack * p_stack,
rp<Expression> * p_emit_expr) override; rp<Expression> * p_emit_expr) override;
virtual void on_colon(exprstatestack * p_stack) override; virtual void on_colon_token(const token_type & tk,
exprstatestack * p_stack) override;
virtual void on_semicolon(exprstatestack * p_stack, virtual void on_semicolon(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override; rp<Expression> * /*p_emit_expr*/) override;
virtual void on_singleassign(exprstatestack * p_stack) override; virtual void on_singleassign(exprstatestack * p_stack) override;

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

@ -43,7 +43,8 @@ namespace xo {
virtual void on_typedescr(TypeDescr td, virtual void on_typedescr(TypeDescr td,
exprstatestack * /*p_stack*/, exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/) override; rp<Expression> * /*p_emit_expr*/) override;
virtual void on_colon(exprstatestack * p_stack) override; virtual void on_colon_token(const token_type & tk,
exprstatestack * p_stack) override;
virtual void on_semicolon(exprstatestack * p_stack, virtual void on_semicolon(exprstatestack * p_stack,
rp<Expression> * /*p_emit_expr*/) override; rp<Expression> * /*p_emit_expr*/) override;
virtual void on_singleassign(exprstatestack * p_stack) override; virtual void on_singleassign(exprstatestack * p_stack) override;

4
src/reader/define_xs.cpp
View file

@ -326,7 +326,9 @@ namespace xo {
} }
void void
define_xs::on_colon(exprstatestack * p_stack) { define_xs::on_colon_token(const token_type & /*tk*/,
exprstatestack * p_stack)
{
constexpr bool c_debug_flag = true; constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag)); scope log(XO_DEBUG(c_debug_flag));

6
src/reader/exprstate.cpp
View file

@ -504,7 +504,9 @@ namespace xo {
} }
void void
exprstate::on_colon(exprstatestack * /*p_stack*/) { exprstate::on_colon_token(const token_type & /*tk*/,
exprstatestack * /*p_stack*/)
{
constexpr bool c_debug_flag = true; constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag)); scope log(XO_DEBUG(c_debug_flag));
@ -686,7 +688,7 @@ namespace xo {
return; return;
case tokentype::tk_colon: case tokentype::tk_colon:
this->on_colon(p_stack); this->on_colon_token(tk, p_stack);
return; return;
case tokentype::tk_doublecolon: case tokentype::tk_doublecolon:

3
src/reader/paren_xs.cpp
View file

@ -108,7 +108,8 @@ namespace xo {
} }
void void
paren_xs::on_colon(exprstatestack * /*p_stack*/) paren_xs::on_colon_token(const token_type & /*tk*/,
exprstatestack * /*p_stack*/)
{ {
constexpr const char * c_self_name = "paren_xs::on_colon"; constexpr const char * c_self_name = "paren_xs::on_colon";

4
src/reader/progress_xs.cpp
View file

@ -82,7 +82,9 @@ namespace xo {
} }
void void
progress_xs::on_colon(exprstatestack * /*p_stack*/) { progress_xs::on_colon_token(const token_type & /*tk*/,
exprstatestack * /*p_stack*/)
{
constexpr const char * self_name = "progress_xs::on_colon"; constexpr const char * self_name = "progress_xs::on_colon";
throw std::runtime_error(tostr(self_name, throw std::runtime_error(tostr(self_name,