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

xo-reader: simplify: adopt exprseq_xs + drop .admits_definition()

Browse source
This commit is contained in:
Roland Conybeare 2024-08-09 19:43:00 -04:00
commit 424a4cd0f1
11 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,9 @@ namespace xo {
defexprstatetype defxs_type() const { return defxs_type_; }
#ifdef OBSOLETE
virtual bool admits_definition() const override;
#endif
virtual bool admits_symbol() const override;
virtual bool admits_colon() const override;
virtual bool admits_semicolon() const override;

5
include/xo/reader/exprseq_xs.hpp
View file

@ -15,6 +15,11 @@ namespace xo {
*
**/
class exprseq_xs : public exprstate {
public:
exprseq_xs();
static std::unique_ptr<exprseq_xs> expect_toplevel_expression_sequence();
public:
// ----- token input methods -----

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

@ -70,9 +70,11 @@ namespace xo {
{}
virtual ~exprstate() = default;
#ifdef RELOCATED
static std::unique_ptr<exprstate> expect_toplevel_expression_sequence() {
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_toplevel_expression_sequence));
}
#endif
static std::unique_ptr<exprstate> expect_rhs_expression() {
return std::make_unique<exprstate>(exprstate(exprstatetype::expect_rhs_expression));
}
@ -85,10 +87,12 @@ namespace xo {
exprstatetype exs_type() const { return exs_type_; }
#ifdef OBSOLETE
/** true iff this parsing state admits a 'def' keyword
* as next token
**/
virtual bool admits_definition() const;
#endif
/** true iff this parsing state admits a symbol as next token **/
virtual bool admits_symbol() const;
/** true iff this parsing state admits a colon as next token **/

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

@ -31,7 +31,9 @@ namespace xo {
static std::unique_ptr<paren_xs> lparen_0();
#ifdef OBSOLETE
virtual bool admits_definition() const override;
#endif
virtual bool admits_symbol() const override;
virtual bool admits_colon() const override;
virtual bool admits_semicolon() const override;

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

@ -22,7 +22,9 @@ namespace xo {
static std::unique_ptr<progress_xs> make(rp<Expression> valex);
#ifdef OBSOLETE
virtual bool admits_definition() const override;
#endif
virtual bool admits_symbol() const override;
virtual bool admits_colon() const override;
virtual bool admits_semicolon() const override;

2
src/reader/define_xs.cpp
View file

@ -15,6 +15,7 @@ namespace xo {
def_expr_{std::move(def_expr)}
{}
#ifdef OBSOLETE
bool
define_xs::admits_definition() const
{
@ -41,6 +42,7 @@ namespace xo {
return false;
}
#endif
bool
define_xs::admits_symbol() const {

12
src/reader/exprseq_xs.cpp
View file

@ -5,6 +5,17 @@
namespace xo {
namespace scm {
std::unique_ptr<exprseq_xs>
exprseq_xs::expect_toplevel_expression_sequence()
{
return std::make_unique<exprseq_xs>(exprseq_xs());
}
exprseq_xs::exprseq_xs()
: exprstate(exprstatetype::expect_toplevel_expression_sequence)
{
}
void
exprseq_xs::on_def_token(const token_type & /*tk*/,
exprstatestack * p_stack)
@ -29,5 +40,4 @@ namespace xo {
} /*namespace scm*/
} /*namespace xo*/
/* end exprseq_xs.cpp */

6
src/reader/exprstate.cpp
View file

@ -323,8 +323,11 @@ namespace xo {
void
exprstate::on_def_token(const token_type & tk,
exprstatestack * p_stack)
exprstatestack * /*p_stack*/)
{
this->illegal_input_error("exprstate::on_def_token", tk);
#ifdef OBSOLETE
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
@ -347,6 +350,7 @@ namespace xo {
* def pi : f64 = 3.14159265
* def sq(x : f64) -> f64 { (x * x) }
*/
#endif
}
void

2
src/reader/paren_xs.cpp
View file

@ -14,8 +14,10 @@ namespace xo {
return std::make_unique<paren_xs>(paren_xs());
}
#ifdef OBSOLETE
bool
paren_xs::admits_definition() const { return false; }
#endif
bool
paren_xs::admits_symbol() const { return true; }

3
src/reader/parser.cpp
View file

@ -5,6 +5,7 @@
#include "parser.hpp"
#include "define_xs.hpp"
#include "exprseq_xs.hpp"
#include "xo/expression/DefineExpr.hpp"
#include "xo/expression/Constant.hpp"
#include "xo/expression/ConvertExpr.hpp"
@ -30,7 +31,7 @@ namespace xo {
void
parser::begin_translation_unit() {
xs_stack_.push_exprstate
(exprstate::expect_toplevel_expression_sequence());
(exprseq_xs::expect_toplevel_expression_sequence());
}
rp<Expression>

2
src/reader/progress_xs.cpp
View file

@ -14,8 +14,10 @@ namespace xo {
gen_expr_{std::move(valex)}
{}
#ifdef OBSOLETE
bool
progress_xs::admits_definition() const { return false; }
#endif
bool
progress_xs::admits_symbol() const { return false; }