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

6
xo-reader/README
View file

@ -17,7 +17,7 @@ a. create DefineExpr with TypeVariable.
// compose these into Expressions.
//
struct TypeTemplateRef {
struct type_ref {
bool is_concrete() const { return td_ && td_->is_concrete(); }
// generated name, so we can map between types. Don't want to create TypeDescr
@ -29,10 +29,10 @@ struct TypeTemplateRef {
// what we know about a type
//
struct TypeTemplate : public Refcounted {
struct TypeBlueprint : public Refcounted {
static bool equal(bp<TypeTemplate> lhs, bp<TypeTemplate> rhs);
TypeTemplateRef ref_;
type_ref ref_;
// additional descriptive info...
};

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();

6
xo-reader/src/reader/expect_expr_xs.cpp
View file

@ -229,8 +229,7 @@ namespace xo {
expect_expr_xs::on_expr(bp<Expression> expr,
parserstatemachine * p_psm)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
scope log(XO_DEBUG(p_psm->debug_flag()));
log && log(xtag("exstype", this->exs_type_),
xtag("expr", expr.promote()));
@ -244,8 +243,7 @@ namespace xo {
expect_expr_xs::on_expr_with_semicolon(bp<Expression> expr,
parserstatemachine * p_psm)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
scope log(XO_DEBUG(p_psm->debug_flag()));
log && log(xtag("exstype", this->exs_type_),
xtag("expr", expr.promote()));

6
xo-reader/src/reader/exprstate.cpp
View file

@ -109,8 +109,7 @@ namespace xo {
{
/* returning type description to something that wants it */
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
scope log(XO_DEBUG(p_psm->debug_flag()));
log && log(xtag("exstype",
p_psm->top_exprstate().exs_type()));
@ -171,8 +170,7 @@ namespace xo {
exprstate::on_colon_token(const token_type & tk,
parserstatemachine * p_psm)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
scope log(XO_DEBUG(p_psm->debug_flag()));
constexpr const char * c_self_name = "exprstate::on_colon";
const char * exp = get_expect_str();

1
xo-reader/src/reader/exprstatestack.cpp
View file

@ -4,6 +4,7 @@
*/
#include "exprstatestack.hpp"
#include "pretty_exprstatestack.hpp"
#include <cstdint>
namespace xo {

98
xo-reader/src/reader/lambda_xs.cpp
View file

@ -5,6 +5,7 @@
#include "exprstatestack.hpp"
#include "expect_formal_arglist_xs.hpp"
#include "expect_expr_xs.hpp"
#include "expect_type_xs.hpp"
#include "xo/expression/Lambda.hpp"
namespace xo {
@ -20,6 +21,8 @@ namespace xo {
case lambdastatetype::lm_1: return "lm_1";
case lambdastatetype::lm_2: return "lm_2";
case lambdastatetype::lm_3: return "lm_3";
case lambdastatetype::lm_4: return "lm_4";
case lambdastatetype::lm_5: return "lm_5";
default: break;
}
@ -47,9 +50,11 @@ namespace xo {
lambda_xs::get_expect_str() const
{
/*
* lambda (x : f64) { ... } ;
* ^ ^ ^ ^
* | | | lm_3
* lambda (x : f64) : f64 { ... } ;
* ^ ^ ^ ^ ^ ^
* | | | | | lm_5
* | | | | lm_4:expect_expression
* | | | lm_3
* | | lm_2
* | lm_1:
* expect_expression
@ -63,8 +68,12 @@ namespace xo {
case lambdastatetype::lm_1:
return "lambda-params";
case lambdastatetype::lm_2:
return "lambda-body";
return "colon|lambda-body";
case lambdastatetype::lm_3:
return "type";
case lambdastatetype::lm_4:
return "lambda-body";
case lambdastatetype::lm_5:
return "semicolon";
}
@ -94,24 +103,12 @@ namespace xo {
p_psm->push_envframe(local_env_);
expect_expr_xs::start(p_psm);
//expect_expr_xs::start(p_psm);
} else {
exprstate::on_formal_arglist(argl, p_psm);
}
}
void
lambda_xs::on_expr(bp<Expression> expr,
parserstatemachine * p_psm)
{
if (lmxs_type_ == lambdastatetype::lm_2) {
this->lmxs_type_ = lambdastatetype::lm_3;
this->body_ = expr.promote();
} else {
exprstate::on_expr(expr, p_psm);
}
}
void
lambda_xs::on_expr_with_semicolon(bp<Expression> expr,
parserstatemachine * p_psm)
@ -120,11 +117,74 @@ namespace xo {
this->on_semicolon_token(token_type::semicolon(), p_psm);
}
void
lambda_xs::on_colon_token(const token_type & tk,
parserstatemachine * p_psm)
{
constexpr const char * c_self_name = "lambda_xs::on_colon_token";
if (lmxs_type_ == lambdastatetype::lm_2) {
this->lmxs_type_ = lambdastatetype::lm_3;
expect_type_xs::start(p_psm);
/* control reenters via .on_typedescr() */
} else {
this->illegal_input_on_token(c_self_name, tk, this->get_expect_str(), p_psm);
}
}
void
lambda_xs::on_leftbrace_token(const token_type & tk,
parserstatemachine * p_psm)
{
constexpr const char * c_self_name = "lambda_xs::on_leftbrace_token";
if (lmxs_type_ == lambdastatetype::lm_2)
this->lmxs_type_ = lambdastatetype::lm_4;
if (lmxs_type_ == lambdastatetype::lm_4) {
expect_expr_xs::start(p_psm);
/* want { to start expr sequence, that finishes on matching } */
p_psm->on_leftbrace_token(token_type::leftbrace());
} else {
this->illegal_input_on_token(c_self_name, tk, this->get_expect_str(), p_psm);
}
}
void
lambda_xs::on_typedescr(TypeDescr td,
parserstatemachine * p_psm)
{
constexpr const char * c_self_name = "lambda_xs::on_typedescr";
if (lmxs_type_ == lambdastatetype::lm_3) {
this->lmxs_type_ = lambdastatetype::lm_4;
this->explicit_return_td_ = td;
expect_expr_xs::start(p_psm);
/* control reenters via .on_expr() or .on_expr_with_semicolon() */
} else {
this->illegal_input_on_type(c_self_name, td, this->get_expect_str(), p_psm);
}
}
void
lambda_xs::on_expr(bp<Expression> expr,
parserstatemachine * p_psm)
{
constexpr const char * c_self_name = "lambda_xs::on_expr";
if (lmxs_type_ == lambdastatetype::lm_4) {
this->lmxs_type_ = lambdastatetype::lm_5;
this->body_ = expr.promote();
} else {
this->illegal_input_on_expr(c_self_name, expr, this->get_expect_str(), p_psm);
}
}
void
lambda_xs::on_semicolon_token(const token_type & tk,
parserstatemachine * p_psm)
{
if (lmxs_type_ == lambdastatetype::lm_3) {
if (lmxs_type_ == lambdastatetype::lm_5) {
/* done! */
std::unique_ptr<exprstate> self = p_psm->pop_exprstate();
@ -134,7 +194,7 @@ namespace xo {
/* top env frame recorded arguments to this lambda */
p_psm->pop_envframe();
rp<Lambda> lm = Lambda::make_from_env(name, local_env_, body_);
rp<Lambda> lm = Lambda::make_from_env(name, local_env_, explicit_return_td_, body_);
p_psm->top_exprstate().on_expr(lm, p_psm);
p_psm->top_exprstate().on_semicolon_token(tk, p_psm);

1
xo-reader/src/reader/let1_xs.cpp
View file

@ -141,6 +141,7 @@ namespace xo {
rp<Expression> lambda
= Lambda::make_from_env(lambda_name,
local_env_,
nullptr /*explicit_return_td*/,
expr);
rp<Expression> result

14
xo-reader/src/reader/pretty_parserstatemachine.cpp
View file

@ -36,5 +36,19 @@ namespace xo {
}
}
bool
ppdetail<xo::scm::parserstatemachine *>::print_pretty(const ppindentinfo & ppii, const xo::scm::parserstatemachine * x)
{
if (x) {
return ppdetail<xo::scm::parserstatemachine>::print_pretty(ppii, *x);
} else {
if (ppii.upto()) {
return ppii.pps()->print_upto("<nullptr>");
} else {
ppii.pps()->write("<nullptr>");
return false;
}
}
}
} /*namespace print*/
} /*namespace xo*/

16
xo-reader/src/reader/sequence_xs.cpp
View file

@ -36,8 +36,7 @@ namespace xo {
sequence_xs::on_expr(bp<Expression> expr,
parserstatemachine * p_psm)
{
constexpr bool c_debug_flag = true;
scope log(XO_DEBUG(c_debug_flag));
scope log(XO_DEBUG(p_psm->debug_flag()));
log && log(xtag("expr", expr.promote()));
@ -93,6 +92,14 @@ namespace xo {
}
}
void
sequence_xs::on_expr_with_semicolon(bp<Expression> expr,
parserstatemachine * p_psm)
{
/* sequence continues until right brace */
this->on_expr(expr, p_psm);
}
void
sequence_xs::on_rightbrace_token(const token_type & /*tk*/,
parserstatemachine * p_psm)
@ -107,6 +114,11 @@ namespace xo {
p_psm->top_exprstate().on_expr(expr, p_psm);
}
void
sequence_xs::print(std::ostream & os) const {
os << "<sequence_xs" << xtag("expr_v.size", expr_v_.size()) << ">";
}
} /*namespace scm*/
} /*namespace xo*/