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

xo-reader: refactor: move defexpr on_symbol to dedicated define_xs

Browse source
This commit is contained in:
Roland Conybeare 2024-08-07 16:32:32 -04:00
commit 3a1db8ca02
3 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/reader/define_xs.cpp
View file

@ -65,6 +65,45 @@ namespace xo {
return;
}
}
void
define_xs::on_symbol(const std::string & symbol_name,
exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
{
switch (this->exs_type_) {
case exprstatetype::expect_toplevel_expression_sequence:
/* unreachable */
assert(false);
return;
case exprstatetype::def_0:
this->exs_type_ = exprstatetype::def_1;
this->def_expr_->assign_lhs_name(symbol_name);
//this->def_lhs_symbol_ = symbol_name;
return;
case exprstatetype::def_1:
case exprstatetype::def_2:
case exprstatetype::def_3:
case exprstatetype::def_4:
case exprstatetype::def_5:
/* NOT IMPLEMENTED */
assert(false);
return;
case exprstatetype::lparen_0:
case exprstatetype::lparen_1:
case exprstatetype::expect_rhs_expression:
case exprstatetype::expect_type:
case exprstatetype::expect_symbol:
case exprstatetype::expr_progress:
case exprstatetype::invalid:
case exprstatetype::n_exprstatetype:
/* unreachable */
assert(false);
return;
}
}
} /*namespace scm*/
} /*namespace xo*/

9
src/reader/parser.cpp
View file

@ -991,7 +991,7 @@ namespace xo {
} /*on_expr*/
void
exprstate::on_symbol(const std::string & symbol_name,
exprstate::on_symbol(const std::string & /*symbol_name*/,
exprstatestack * /*p_stack*/,
rp<Expression> * /*p_emit_expr*/)
{
@ -1007,17 +1007,12 @@ namespace xo {
assert(false);
return;
case exprstatetype::def_0:
this->exs_type_ = exprstatetype::def_1;
this->def_expr_->assign_lhs_name(symbol_name);
//this->def_lhs_symbol_ = symbol_name;
return;
case exprstatetype::def_1:
case exprstatetype::def_2:
case exprstatetype::def_3:
case exprstatetype::def_4:
case exprstatetype::def_5:
/* NOT IMPLEMENTED */
/* unreachable */
assert(false);
return;