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

xo-parser: simplify: drop expraction.expr_ir_

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

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

@ -134,18 +134,23 @@ namespace xo {
class expraction {
public:
expraction() = default;
explicit expraction(expractiontype action_type,
const exprir & expr_ir)
: action_type_{action_type}, expr_ir_{expr_ir}
explicit expraction(expractiontype action_type
#ifdef OBSOLETE
const exprir & expr_ir
#endif
)
: action_type_{action_type}
#ifdef OBSOLETE
, expr_ir_{expr_ir}
#endif
{}
static expraction keep();
#ifdef OBSOLETE
static expraction emit(const exprir & ir);
#endif
expractiontype action_type() const { return action_type_; }
#ifdef OBSOLETE
const exprir & expr_ir() const { return expr_ir_; }
#endif
void print(std::ostream & os) const;
@ -158,10 +163,12 @@ namespace xo {
* pop: drop exprstate, report exprir to parent
**/
expractiontype action_type_ = expractiontype::invalid;
#ifdef OBSOLETE
/**
* intermediate representation (pass to enclosing stack state)
**/
exprir expr_ir_;
#endif
};
inline std::ostream &

12
src/parser/parser.cpp
View file

@ -96,23 +96,13 @@ namespace xo {
expraction
expraction::keep() {
return expraction(expractiontype::keep,
exprir());
return expraction(expractiontype::keep);
}
#ifdef OBSOLETE
expraction
expraction::emit(const exprir & ir) {
return expraction(expractiontype::emit,
ir);
}
#endif
void
expraction::print(std::ostream & os) const {
os << "<expraction";
os << xtag("type", action_type_);
os << xtag("ir", expr_ir_);
os << ">";
}