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

xo-reader: refactor: demote exprstate.gen_expr to leaves that care

Browse source
This commit is contained in:
Roland Conybeare 2024-08-09 12:58:11 -04:00
commit b813e55194
5 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,34 +56,23 @@ namespace xo {
public:
exprstate() = default;
exprstate(exprstatetype exs_type,
rp<Expression> candidate_expr)
: exs_type_{exs_type},
gen_expr_{std::move(candidate_expr)} {}
exprstate(exprstatetype exs_type)
: exs_type_{exs_type}
{}
virtual ~exprstate() = default;
static std::unique_ptr<exprstate> expect_toplevel_expression_sequence() {
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_toplevel_expression_sequence, nullptr));
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_toplevel_expression_sequence));
}
static std::unique_ptr<exprstate> expect_rhs_expression() {
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_rhs_expression, nullptr));
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_rhs_expression));
}
static std::unique_ptr<exprstate> expect_symbol() {
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_symbol, nullptr));
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_symbol));
}
static std::unique_ptr<exprstate> expect_type() {
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_type, nullptr));
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_type));
}
#ifdef RELOCATED
static std::unique_ptr<exprstate> make_expr_progress(rp<Expression> expr) {
return std::make_unique<exprstate>(exprstate(exprstatetype::expr_progress, expr));
}
#endif
#ifdef RELOCATED
static std::unique_ptr<exprstate> lparen_0() {
return std::make_unique<exprstate>(exprstate(exprstatetype::lparen_0, nullptr));
}
#endif
exprstatetype exs_type() const { return exs_type_; }
@ -144,10 +133,8 @@ namespace xo {
rp<Expression> * p_emit_expr);
protected:
/** explicit subtype: identifies derived class **/
exprstatetype exs_type_;
/** generic expression **/
rp<Expression> gen_expr_;
}; /*exprstate*/
inline std::ostream &

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

@ -78,6 +78,8 @@ namespace xo {
* lparen_0
**/
parenexprstatetype parenxs_type_;
/** populate expression (representing parenthesized value) here **/
rp<Expression> gen_expr_;
};
} /*namespace scm*/
} /*namespace xo*/

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

@ -58,10 +58,8 @@ namespace xo {
virtual void print(std::ostream & os) const override;
private:
#ifdef NOT_YET
/** populate an expression here **/
rp<Expression> gen_expr_;
#endif
};
} /*namespace scm*/
} /*namespace xo*/

3
src/reader/define_xs.cpp
View file

@ -10,8 +10,7 @@ namespace xo {
}
define_xs::define_xs(rp<DefineExprAccess> def_expr)
: exprstate(exprstatetype::defexpr,
nullptr /*gen_expr*/),
: exprstate(exprstatetype::defexpr),
defxs_type_{defexprstatetype::def_0},
def_expr_{std::move(def_expr)}
{}

4
src/reader/progress_xs.cpp
View file

@ -10,8 +10,8 @@ namespace xo {
}
progress_xs::progress_xs(rp<Expression> valex)
: exprstate(exprstatetype::expr_progress,
std::move(valex))
: exprstate(exprstatetype::expr_progress),
gen_expr_{std::move(valex)}
{}
bool