kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Resolve an ambiguity between ifs and attribute selection, e.g., `if

Browse source 
b then x else y.z'.
This commit is contained in:
Eelco Dolstra 2004-02-19 13:11:12 +00:00
parent 86b7efbdbe
commit dbf547645d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/parser.y
View file

@ -32,7 +32,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, void * data, char * s)
ATermList ts; ATermList ts;
} }
%type <t> start expr expr_function expr_assert expr_op %type <t> start expr expr_function expr_assert expr_if expr_op
%type <t> expr_app expr_select expr_simple bind inheritsrc formal %type <t> expr_app expr_select expr_simple bind inheritsrc formal
%type <ts> binds ids expr_list formals %type <ts> binds ids expr_list formals
%token <t> ID INT STR PATH URI %token <t> ID INT STR PATH URI
@ -60,6 +60,12 @@ expr_function
expr_assert expr_assert
: ASSERT expr ';' expr_assert : ASSERT expr ';' expr_assert
{ $$ = ATmake("Assert(<term>, <term>)", $2, $4); } { $$ = ATmake("Assert(<term>, <term>)", $2, $4); }
| expr_if
;
expr_if
: IF expr THEN expr ELSE expr
{ $$ = ATmake("If(<term>, <term>, <term>)", $2, $4, $6); }
| expr_op | expr_op
; ;
@ -102,8 +108,6 @@ expr_simple
| '{' binds '}' | '{' binds '}'
{ $$ = fixAttrs(0, $2); } { $$ = fixAttrs(0, $2); }
| '[' expr_list ']' { $$ = ATmake("List(<term>)", $2); } | '[' expr_list ']' { $$ = ATmake("List(<term>)", $2); }
| IF expr THEN expr ELSE expr
{ $$ = ATmake("If(<term>, <term>, <term>)", $2, $4, $6); }
; ;
binds binds