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

xo-reader xo-expression xo-tokenizer xo-jit: comparison + apply

Browse source
This commit is contained in:
Roland Conybeare 2025-07-23 23:19:16 -05:00
commit cb7107521b
13 changed files with 486 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

113
include/xo/reader/apply_xs.hpp Normal file
View file

@ -0,0 +1,113 @@
/* @file apply_xs.hpp */
#pragma once
#include "exprstate.hpp"
#include "xo/expression/Apply.hpp"
namespace xo {
namespace scm {
/**
* fn ( arg1 , arg2 , .. , argn )
* ^ ^ ^ ^ ^ ^ ^ ^ ^
* | | | | | | | | (done)
* | | | | | | | apply_3
* | | | | | | apply_2:expect_rhs_expression
* | | | | | apply_3
* | | | | apply_2:expect_rhs_expression
* | | | apply_3
* | | apply_2:expect_rhs_expression
* | apply_1
* apply_0:expect_rhs_expression
*
* apply_0 --on_expr()--> apply_1
* apply_1 --on_leftparen()--> apply_2
* apply_2 --on_expr()--> apply_3
* apply_3 --on_comma()--> apply_2
* --on_rightparen()-> (done)
*
* apply_0: start
* apply_1: leftparen following expr allows parser to recognize apply
* apply_2: expect next argument
* apply_3: got argument, expect comma or rightparen to continue
* (done): apply complete, pop exprstate from stack
*
* In practice will start in state apply_1
**/
enum class applyexprstatetype {
invalid = -1,
apply_0,
apply_1,
apply_2,
apply_3,
n_applyexprstatetype
};
extern const char * applyexprstatetype_descr(applyexprstatetype x);
std::ostream &
operator<<(std::ostream & os, applyexprstatetype x);
/** @class apply_xs
* @brief state machine for parsing a schematic function-call-expression
*
*/
class apply_xs : public exprstate {
public:
using Apply = xo::ast::Apply;
public:
explicit apply_xs();
virtual ~apply_xs() = default;
/** downcast from parent type **/
static const apply_xs * from(const exprstate * x) {
return dynamic_cast<const apply_xs *>(x);
}
/**
* Start apply. Will trigger this after input like
* "fn("
*
* apply_xs remains on expr stack until closing right paren
* fn(arg1-expr, arg2-expr, ...)
*
* @p fnex expression in function position
* @p p_psm parser state machine
**/
static void start(rp<Expression> fnex,
parserstatemachine * p_psm);
virtual const char * get_expect_str() const override;
virtual void on_expr(bp<Expression> expr,
parserstatemachine * p_psm) override;
virtual void on_comma_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_leftparen_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_rightparen_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void print(std::ostream & os) const override;
private:
static std::unique_ptr<apply_xs> make();
private:
/** current state of parser for this apply expression **/
applyexprstatetype applyxs_type_ = applyexprstatetype::apply_0;
/** evaluates to function to be invoked **/
rp<Expression> fn_expr_;
/** evaluates to the arguments to pass to @ref fn_ **/
std::vector<rp<Expression>> args_expr_v_;
};
} /*namespace scm */
} /*namespace xo*/
/* end apply_xs.hpp */

12
include/xo/reader/expect_expr_xs.hpp
View file

@ -35,9 +35,14 @@ namespace xo {
bool cxl_on_rightbrace,
parserstatemachine * p_psm);
virtual const char * get_expect_str() const override;
virtual void on_lambda_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_if_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_def_token(const token_type & tk,
parserstatemachine * p_psm) override;
@ -71,20 +76,21 @@ namespace xo {
virtual void on_expr_with_semicolon(bp<Expression> expr,
parserstatemachine * p_psm) override;
virtual void print(std::ostream & os) const override;
private:
static std::unique_ptr<expect_expr_xs> make(bool allow_defs,
bool cxl_on_rightbrace);
private:
/* if true: allow a define-expression here */
/** if true: allow a define-expression here **/
bool allow_defs_ = false;
/* if true: expecting either:
/** if true: expecting either:
* - expression
* - right brace '}', in which case no expression
* if false: expecting
* - expression
*/
**/
bool cxl_on_rightbrace_ = false;
};

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

@ -30,6 +30,11 @@ namespace xo {
**/
lambdaexpr,
/** handle apply expression (aka function call)
* see @ref apply_xs
**/
applyexpr,
/** handle parenthesized expression
* see @ref paren_xs
**/

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

@ -19,12 +19,30 @@ namespace xo {
enum class optype {
invalid = -1,
/** op:= **/
op_assign,
/** op< **/
op_less,
/** op<= **/
op_less_equal,
/** op== **/
op_equal,
/** op!= **/
op_not_equal,
/** op> **/
op_great,
/** op>= **/
op_great_equal,
/** op+ **/
op_add,
/** op- **/
op_subtract,
/** op* **/
op_multiply,
/** op/ **/
op_divide,
n_optype
@ -104,6 +122,9 @@ namespace xo {
virtual void on_operator_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_bool_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_i64_token(const token_type & tk,
parserstatemachine * p_psm) override;