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

xo-parser: feature: def may omit explicit type

Browse source
This commit is contained in:
Roland Conybeare 2024-08-01 16:56:08 +10:00
commit 4df9192586
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/xo/parser/parser.hpp
View file

@ -141,14 +141,10 @@ namespace xo {
/** scaffold a define-expression here **/
rp<DefineExprAccess> def_expr_;
rp<ConvertExprAccess> cvt_expr_;
#ifdef OBSOLETE
/** e.g. f64 in
* def foo : f64 = 1
/** scafford a convert-expression here.
* May be nested within a def_expr
**/
TypeDescr def_lhs_td_ = nullptr;
#endif
rp<ConvertExprAccess> cvt_expr_;
}; /*exprstate*/
inline std::ostream &

24
src/parser/parser.cpp
View file

@ -194,8 +194,27 @@ namespace xo {
exprstate::admits_singleassign() const {
switch(exs_type_) {
case exprstatetype::expect_toplevel_expression_sequence:
/*
* def foo = 1
* def foo : f64 = 1
* ^ ^ ^ ^ ^ ^ ^
* | | | | | | (done)
* | | | | | def_4:expect_rhs_expression
* | | | | def_3
* | | | def_2:expect_type
* | | def_1
* | def_0:expect_symbol
* expect_toplevel_expression_sequence
*
* note that we skip from def_1 -> def_4 if '=' instead of ':'
*/
case exprstatetype::def_0:
return false;
case exprstatetype::def_1:
return true;
case exprstatetype::def_2:
return false;
@ -203,6 +222,7 @@ namespace xo {
return true;
case exprstatetype::def_4:
case exprstatetype::expect_rhs_expression:
/* rhs-expressions (or expressions for that matter)
* may not begin with singleassign '='
@ -437,7 +457,9 @@ namespace xo {
xtag("state", *this)));
}
if (this->exs_type_ == exprstatetype::def_3) {
if ((this->exs_type_ == exprstatetype::def_1)
|| (this->exs_type_ == exprstatetype::def_3))
{
this->exs_type_ = exprstatetype::def_4;
p_stack->push_exprstate(exprstatetype::expect_rhs_expression);