Skip to content
Snippets Groups Projects
Commit 42d8c401 authored by Fredrik Hübinette (Hubbe)'s avatar Fredrik Hübinette (Hubbe)
Browse files

oops

Rev: src/language.yacc:1.66
parent 062e9d27
No related branches found
No related tags found
No related merge requests found
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
/* This is the grammar definition of Pike. */ /* This is the grammar definition of Pike. */
#include "global.h" #include "global.h"
RCSID("$Id: language.yacc,v 1.65 1998/03/04 22:17:05 hubbe Exp $"); RCSID("$Id: language.yacc,v 1.66 1998/03/04 23:49:54 hubbe Exp $");
#ifdef HAVE_MEMORY_H #ifdef HAVE_MEMORY_H
#include <memory.h> #include <memory.h>
#endif #endif
...@@ -310,7 +310,6 @@ int yylex(YYSTYPE *yylval); ...@@ -310,7 +310,6 @@ int yylex(YYSTYPE *yylval);
%type <n> expr2 %type <n> expr2
%type <n> expr3 expr0 %type <n> expr3 expr0
%type <n> expr4 %type <n> expr4
%type <n> expr5
%type <n> expr_list %type <n> expr_list
%type <n> expr_list2 %type <n> expr_list2
%type <n> for %type <n> for
...@@ -1249,9 +1248,9 @@ expr4: string ...@@ -1249,9 +1248,9 @@ expr4: string
} }
| '(' comma_expr2 ')' { $$=$2; } | '(' comma_expr2 ')' { $$=$2; }
| '(' '{' expr_list '}' ')' | '(' '{' expr_list '}' ')'
{ $$=mkefuncallnode("aggregate",$2); } { $$=mkefuncallnode("aggregate",$3); }
| '(' '[' m_expr_list ']' ')' | '(' '[' m_expr_list ']' ')'
{ $$=mkefuncallnode("aggregate_mapping",$2); }; { $$=mkefuncallnode("aggregate_mapping",$3); };
| F_MULTISET_START expr_list F_MULTISET_END | F_MULTISET_START expr_list F_MULTISET_END
{ $$=mkefuncallnode("aggregate_multiset",$2); } { $$=mkefuncallnode("aggregate_multiset",$2); }
| expr4 F_ARROW F_IDENTIFIER | expr4 F_ARROW F_IDENTIFIER
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment