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

xo-parser: + expraction::pop() & apply

Browse source
This commit is contained in:
Roland Conybeare 2024-08-01 10:31:42 +10:00
commit 2f7176b102
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/xo/parser/parser.hpp
View file

@ -147,6 +147,7 @@ namespace xo {
static expraction keep();
static expraction emit(const exprir & ir);
static expraction push2(exprstatetype s1, exprstatetype s2);
static expraction pop(const exprir & ir);
expractiontype action_type() const { return action_type_; }
const exprir & expr_ir() const { return expr_ir_; }

30
src/parser/parser.cpp
View file

@ -127,6 +127,14 @@ namespace xo {
s2);
}
expraction
expraction::pop(const exprir & ir) {
return expraction(expractiontype::pop,
ir,
exprstatetype::invalid /*not used*/,
exprstatetype::invalid /*not used*/);
}
void
expraction::print(std::ostream & os) const {
os << "<expraction";
@ -337,10 +345,7 @@ namespace xo {
case exprstatetype::expect_rhs_expression:
case exprstatetype::expect_symbol:
return expraction(expractiontype::pop,
exprir(exprirtype::symbol, tk.text()),
exprstatetype::invalid /*not used*/,
exprstatetype::invalid /*not used*/);
return expraction::pop(exprir(exprirtype::symbol, tk.text()));
case exprstatetype::expect_type: {
TypeDescr td = nullptr;
@ -366,10 +371,7 @@ namespace xo {
xtag("typename", tk.text())));
}
return expraction(expractiontype::pop,
exprir(exprirtype::typedescr, td),
exprstatetype::invalid /*not used*/,
exprstatetype::invalid /*not used*/);
return expraction::pop(exprir(exprirtype::typedescr, td));
}
case exprstatetype::invalid:
@ -450,11 +452,8 @@ namespace xo {
}
if (this->exs_type_ == exprstatetype::expect_rhs_expression) {
return expraction(expractiontype::pop,
exprir(exprirtype::expression,
Constant<double>::make(tk.f64_value())),
exprstatetype::invalid /*not used*/,
exprstatetype::invalid /*not used*/);
return expraction::pop(exprir(exprirtype::expression,
Constant<double>::make(tk.f64_value())));
} else {
assert(false);
return expraction();
@ -594,10 +593,7 @@ namespace xo {
rp<Expression> def = DefineExpr::make(this->def_lhs_symbol_,
rhs_value);
return expraction(expractiontype::pop,
exprir(exprirtype::expression, def),
exprstatetype::invalid /*not used*/,
exprstatetype::invalid /*not used*/);
return expraction::pop(exprir(exprirtype::expression, def));
} else {
assert(false);
return expraction();