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

xo-expression xo-reader: type unifier + misc improvements

Browse source
This commit is contained in:
Roland Conybeare 2025-07-26 17:28:41 -04:00
commit 75b74918b7
31 changed files with 1005 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xo-reader/include/xo/reader/formal_arg.hpp
View file

@ -42,7 +42,7 @@ namespace xo {
/** formal parameter name **/
std::string name_;
/** type description for variable @p name **/
TypeDescr td_;
TypeDescr td_ = nullptr;
};
inline std::ostream &

26
xo-reader/include/xo/reader/lambda_xs.hpp
View file

@ -12,15 +12,20 @@
namespace xo {
namespace scm {
/**
* lambda ( name(1) : type(1), ..., ) body-expr ;
* ^ ^ ^ ^
* | | | |
* lm_0 lm_1 lm_2 lm_3
* @text
*
* lambda ( name(1) : type(1), ..., ) : type body-expr ;
* ^ ^ ^ ^ ^ ^
* | | | | lm_4 lm_5
* | | | lm_3
* lm_0 lm_1 lm_2
*
* lm_0 --on_lambda_token()--> lm_1
* lm_1 --on_formal_arglist()--> lm_2
* lm_2 --on_expr()--> lm_3
* lm_3 --on_semicolon_token()--> (done)
* lm_5 --on_semicolon_token()--> (done)
*
* @endtext
**/
enum class lambdastatetype {
invalid = -1,
@ -29,6 +34,8 @@ namespace xo {
lm_1,
lm_2,
lm_3,
lm_4,
lm_5,
n_lambdastatetype
};
@ -60,12 +67,18 @@ namespace xo {
virtual void on_lambda_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_typedescr(TypeDescr td,
parserstatemachine * p_psm) override;
virtual void on_formal_arglist(const std::vector<rp<Variable>> & argl,
parserstatemachine * p_psm) override;
virtual void on_expr(bp<Expression> expr,
parserstatemachine * p_psm) override;
virtual void on_expr_with_semicolon(bp<Expression> expr,
parserstatemachine * p_psm) override;
virtual void on_leftbrace_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_colon_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void on_semicolon_token(const token_type & tk,
parserstatemachine * p_psm) override;
@ -81,6 +94,9 @@ namespace xo {
/** lambda environment (for formal parameters) **/
rp<LocalEnv> local_env_;
/** explicit return type (if supplied) **/
TypeDescr explicit_return_td_ = nullptr;
/** body expression **/
rp<Expression> body_;

1
xo-reader/include/xo/reader/pretty_envframestack.hpp
View file

@ -16,5 +16,6 @@ namespace xo {
return p->pretty_print(ppii);
}
};
} /*namespace print*/
} /*namespace xo*/

5
xo-reader/include/xo/reader/pretty_parserstatemachine.hpp
View file

@ -14,5 +14,10 @@ namespace xo {
struct ppdetail<xo::scm::parserstatemachine> {
static bool print_pretty(const ppindentinfo & ppii, const xo::scm::parserstatemachine & x);
};
template<>
struct ppdetail<xo::scm::parserstatemachine*> {
static bool print_pretty(const ppindentinfo & ppii, const xo::scm::parserstatemachine * x);
};
}
} /*namespace xo*/

4
xo-reader/include/xo/reader/sequence_xs.hpp
View file

@ -26,10 +26,14 @@ namespace xo {
virtual void on_expr(bp<Expression> expr,
parserstatemachine * p_psm) override;
virtual void on_expr_with_semicolon(bp<Expression> expr,
parserstatemachine * p_psm) override;
virtual void on_rightbrace_token(const token_type & tk,
parserstatemachine * p_psm) override;
virtual void print(std::ostream & os) const override;
private:
sequence_xs();