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

xo-reader: distinguish interactive sessions

Browse source 
+ allow top-level i64 literals
This commit is contained in:
Roland Conybeare 2025-07-04 10:10:40 -05:00
commit a12a236bc1
16 changed files with 196 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
xo-reader/include/xo/reader/exprseq_xs.hpp
View file

@ -10,15 +10,37 @@
namespace xo {
namespace scm {
enum class exprseqtype {
/** toplevel interactive sequence. Most permissive **/
toplevel_interactive,
/** toplevel non-interactive sequence.
* This used for top-level expressions in a translation unit.
**/
toplevel_batch,
/** nested sequence, for example in function body **/
nested,
};
/** @class exprseq_xs
* @brief parsing state-machine for top-level expression sequence
*
* expression sequences come in several types:
* 1. top-level interactive
* 2. top-level batch
* 3. nested
*
* 1 2 3
* +--------
* def | y y y
* symbol | y n n 1: evaluate as variable
* i64 | y n n 1: evaluate as constant
*
**/
class exprseq_xs : public exprstate {
public:
exprseq_xs();
explicit exprseq_xs(exprseqtype seqtype);
static void start(parserstatemachine * p_psm);
static void start(exprseqtype seqtype, parserstatemachine * p_psm);
public:
// ----- token input methods -----
@ -27,6 +49,8 @@ namespace xo {
parserstatemachine * p_psm) override;
virtual void on_symbol_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_i64_token(const token_type & tk,
parserstatemachine * p_psm) override;
// ----- victory methods -----
@ -34,9 +58,14 @@ namespace xo {
parserstatemachine * p_psm) override;
virtual void on_expr(ref::brw<Expression> expr,
parserstatemachine * p_psm) override;
virtual void on_expr_with_semicolon(ref::brw<Expression> expr,
parserstatemachine * p_psm) override;
private:
static std::unique_ptr<exprseq_xs> make();
static std::unique_ptr<exprseq_xs> make(exprseqtype seqtype);
/** context for this expression sequence **/
exprseqtype xseqtype_;
};
} /*namespace scm*/
} /*namespace xo*/