zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-11 05:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Partially revert commit 46c0127

Browse source 
- Being able to omit optional function arguments is not such a nonsensical
  thing after all. However, the previous grammar was still inadequate for
  representing this in a useful way.
This commit is contained in:
Randy Heit 2013-07-24 20:59:29 -05:00
parent 9c86f1c220
commit 7d304a4cb6
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/zscript/zcc-parse.lemon
View file

@ -997,26 +997,42 @@ expr_list(X) ::= expr_list(A) COMMA expr(B).
* but once you do that, all remaining parameters must also be named. * but once you do that, all remaining parameters must also be named.
* We let higher-level code handle this to keep this file simpler. */ * We let higher-level code handle this to keep this file simpler. */
%type func_expr_list{ZCC_FuncParm *} %type func_expr_list{ZCC_FuncParm *}
%type func_expr_list1{ZCC_FuncParm *} %type func_expr_item{ZCC_FuncParm *}
%type named_expr{ZCC_FuncParm *} %type named_expr{ZCC_FuncParm *}
func_expr_list(X) ::= . func_expr_list(X) ::= func_expr_item(A).
{
X = A;
}
func_expr_list(X) ::= func_expr_list(A) COMMA func_expr_item(B).
{
// Omitted parameters still need to appear as nodes in the list.
if (A == NULL)
{
NEW_AST_NODE(FuncParm,nil_a);
nil_a->Value = NULL;
nil_a->Label = NAME_None;
A = nil_a;
}
if (B == NULL)
{
NEW_AST_NODE(FuncParm,nil_b);
nil_b->Value = NULL;
nil_b->Label = NAME_None;
B = nil_b;
}
X = A;
A->AppendSibling(B);
}
func_expr_item(X) ::= .
{ {
X = NULL; X = NULL;
} }
func_expr_list(X) ::= func_expr_list1(A). func_expr_item(X) ::= named_expr(A).
{ {
X = A; X = A;
} }
func_expr_list1(X) ::= named_expr(A).
{
X = A;
}
func_expr_list1(X) ::= func_expr_list1(A) COMMA named_expr(B).
{
X = A;
A->AppendSibling(B);
}
named_expr(X) ::= IDENTIFIER(A) COLON expr(B). named_expr(X) ::= IDENTIFIER(A) COLON expr(B).
{ {