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

xo-reader: + parserstatemachine.push_exprstate(); simplify lambda_xs

Browse source
This commit is contained in:
Roland Conybeare 2024-08-19 15:58:35 -04:00
commit fa9f4967f2
5 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace xo {
public:
lambda_xs();
static void start(exprstatestack * p_stack, rp<Expression> * p_emit_expr);
static void start(parserstatemachine * p_psm);
virtual void on_lambda_token(const token_type & tk,
parserstatemachine * p_psm) override;

1
include/xo/reader/parserstatemachine.hpp
View file

@ -27,6 +27,7 @@ namespace xo {
std::unique_ptr<exprstate> pop_exprstate();
exprstate & top_exprstate();
void push_exprstate(std::unique_ptr<exprstate> x);
public:
exprstatestack * p_stack_;

7
src/reader/expect_expr_xs.cpp
View file

@ -41,13 +41,8 @@ namespace xo {
//constexpr const char * self_name = "exprstate::on_leftparen";
auto p_stack = p_psm->p_stack_;
auto p_emit_expr = p_psm->p_emit_expr_;
/* push lparen_0 to remember to look for subsequent rightparen. */
lambda_xs::start(p_stack, p_emit_expr);
//p_psm->top_exprstate().on_lambda_token(tk, p_stack, p_emit_expr);
//p_stack->push_exprstate(expect_expr_xs::expect_rhs_expression());
lambda_xs::start(p_psm);
}
void

11
src/reader/lambda_xs.cpp
View file

@ -17,14 +17,11 @@ namespace xo {
}
void
lambda_xs::start(exprstatestack * p_stack,
rp<Expression> * p_emit_expr)
lambda_xs::start(parserstatemachine * p_psm)
{
parserstatemachine psm(p_stack, p_emit_expr);
p_stack->push_exprstate(lambda_xs::make());
p_stack->top_exprstate()
.on_lambda_token(token_type::lambda(), &psm);
p_psm->push_exprstate(lambda_xs::make());
p_psm->top_exprstate()
.on_lambda_token(token_type::lambda(), p_psm);
}
lambda_xs::lambda_xs() : exprstate(exprstatetype::lambdaexpr) {}

10
src/reader/parserstatemachine.cpp
View file

@ -12,6 +12,16 @@ namespace xo {
parserstatemachine::pop_exprstate() {
return p_stack_->pop_exprstate();
}
exprstate &
parserstatemachine::top_exprstate() {
return p_stack_->top_exprstate();
}
void
parserstatemachine::push_exprstate(std::unique_ptr<exprstate> x) {
p_stack_->push_exprstate(std::move(x));
}
} /*namespace scm*/
} /*namespace xo*/