xo-expression xo-reader: parser improvements, prep type inf/unify
This commit is contained in:
parent
622f08856e
commit
f3fde735da
18 changed files with 274 additions and 45 deletions
|
|
@ -6,6 +6,43 @@
|
|||
|
||||
namespace xo {
|
||||
namespace ast {
|
||||
namespace {
|
||||
using xo::scm::prefix_type;
|
||||
|
||||
prefix_type exprtype2prefix(exprtype x)
|
||||
{
|
||||
switch (x) {
|
||||
case exprtype::invalid: assert(false); break;
|
||||
case exprtype::constant: return prefix_type::from_chars("k");
|
||||
case exprtype::primitive: return prefix_type::from_chars("pm");
|
||||
case exprtype::define: return prefix_type::from_chars("def");
|
||||
case exprtype::assign: return prefix_type::from_chars("=");
|
||||
case exprtype::apply: return prefix_type::from_chars("@");
|
||||
case exprtype::lambda: return prefix_type::from_chars("lm");
|
||||
case exprtype::variable: return prefix_type::from_chars("var");
|
||||
case exprtype::ifexpr: return prefix_type::from_chars("if");
|
||||
case exprtype::sequence: return prefix_type::from_chars("seq");
|
||||
case exprtype::convert: return prefix_type::from_chars("cvt");
|
||||
case exprtype::n_expr: assert(false); break;
|
||||
}
|
||||
|
||||
return prefix_type::from_chars("?expr");
|
||||
}
|
||||
}
|
||||
|
||||
GeneralizedExpression::GeneralizedExpression(exprtype extype,
|
||||
TypeDescr valuetype)
|
||||
: extype_{extype},
|
||||
valuetype_ref_{type_ref::dwim(exprtype2prefix(extype), valuetype)}
|
||||
{}
|
||||
|
||||
GeneralizedExpression::GeneralizedExpression(exprtype extype,
|
||||
prefix_type prefix,
|
||||
TypeDescr valuetype)
|
||||
: extype_{extype},
|
||||
valuetype_ref_{type_ref::dwim(prefix, valuetype)}
|
||||
{}
|
||||
|
||||
std::string
|
||||
GeneralizedExpression::display_string() const {
|
||||
return tostr(*this);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue