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

xo-reader: refactor: specialize admits_definition() for define_xs

Browse source
This commit is contained in:
Roland Conybeare 2024-08-07 16:36:46 -04:00
commit 3f949dd3e4
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,8 @@ namespace xo {
static std::unique_ptr<define_xs> def_0(rp<DefineExprAccess> def_expr);
virtual bool admits_definition() const override;
// virtual void on_f64(..) override
virtual void on_expr(ref::brw<Expression> expr,
exprstatestack * p_stack,
rp<Expression> * p_emit_expr) override;

37
src/reader/define_xs.cpp
View file

@ -10,6 +10,43 @@ namespace xo {
def_expr)
{}
bool
define_xs::admits_definition() const
{
switch (exs_type_) {
case exprstatetype::expect_toplevel_expression_sequence:
/* unreachable */
assert(false);
return false;
case exprstatetype::def_0:
case exprstatetype::def_1:
case exprstatetype::def_2:
case exprstatetype::def_3:
case exprstatetype::def_4:
case exprstatetype::def_5:
/* note for def_4:
* rhs could certainly be a function body that contains
* nested defines; but then immediately-enclosing-exprstate
* would be a block
*/
return false;
case exprstatetype::lparen_0:
case exprstatetype::lparen_1:
case exprstatetype::expect_rhs_expression:
case exprstatetype::expect_symbol:
case exprstatetype::expect_type:
case exprstatetype::expr_progress:
case exprstatetype::invalid:
case exprstatetype::n_exprstatetype:
/* unreachable */
assert(false);
return false;
}
return false;
}
void
define_xs::on_expr(ref::brw<Expression> expr,
exprstatestack * /* p_stack */,

6
src/reader/parser.cpp
View file

@ -70,11 +70,7 @@ namespace xo {
case exprstatetype::def_3:
case exprstatetype::def_4:
case exprstatetype::def_5:
/* note for def_4:
* rhs could certainly be a function body that contains
* nested defines; but then immediately-enclosing-exprstate
* would be a block
*/
/* unreachable */
return false;
case exprstatetype::lparen_0:
case exprstatetype::lparen_1: