From 0dd66a4bcc4d5b6c8784d1f73944081da5ad9133 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 19 Aug 2024 00:17:32 -0400 Subject: [PATCH] xo-reader: refactor: simplify expect_formal_xs api --- src/reader/expect_formal_arglist_xs.cpp | 2 -- src/reader/expect_formal_xs.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/reader/expect_formal_arglist_xs.cpp b/src/reader/expect_formal_arglist_xs.cpp index 469566bc..5b58e3cf 100644 --- a/src/reader/expect_formal_arglist_xs.cpp +++ b/src/reader/expect_formal_arglist_xs.cpp @@ -55,7 +55,6 @@ namespace xo { this->farglxs_type_ = formalarglstatetype::argl_1a; /* TODO: refactor to have setup method on each exprstate */ expect_formal_xs::start(p_stack); - expect_symbol_xs::start(p_stack); } else { exprstate::on_leftparen_token(tk, p_stack, p_emit_expr); } @@ -82,7 +81,6 @@ namespace xo { if (farglxs_type_ == formalarglstatetype::argl_1b) { this->farglxs_type_ = formalarglstatetype::argl_1a; expect_formal_xs::start(p_stack); - expect_symbol_xs::start(p_stack); } else { exprstate::on_comma_token(tk, p_stack, p_emit_expr); } diff --git a/src/reader/expect_formal_xs.cpp b/src/reader/expect_formal_xs.cpp index 31c0ccf9..3be6bcf8 100644 --- a/src/reader/expect_formal_xs.cpp +++ b/src/reader/expect_formal_xs.cpp @@ -4,6 +4,7 @@ */ #include "expect_formal_xs.hpp" +#include "expect_symbol_xs.hpp" #include "expect_type_xs.hpp" #include "xo/expression/Variable.hpp" @@ -37,6 +38,8 @@ namespace xo { void expect_formal_xs::start(exprstatestack * p_stack) { p_stack->push_exprstate(expect_formal_xs::make()); + + expect_symbol_xs::start(p_stack); } expect_formal_xs::expect_formal_xs()