diff --git a/src/language.yacc b/src/language.yacc index 33dd47ae79e8932be5bf9237816dab9c821fd054..4bfa60e1605264be49b0af1ccb0f4259c7a635c7 100644 --- a/src/language.yacc +++ b/src/language.yacc @@ -161,7 +161,7 @@ /* This is the grammar definition of Pike. */ #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 #include <memory.h> #endif @@ -310,7 +310,6 @@ int yylex(YYSTYPE *yylval); %type <n> expr2 %type <n> expr3 expr0 %type <n> expr4 -%type <n> expr5 %type <n> expr_list %type <n> expr_list2 %type <n> for @@ -1249,9 +1248,9 @@ expr4: string } | '(' comma_expr2 ')' { $$=$2; } | '(' '{' expr_list '}' ')' - { $$=mkefuncallnode("aggregate",$2); } + { $$=mkefuncallnode("aggregate",$3); } | '(' '[' m_expr_list ']' ')' - { $$=mkefuncallnode("aggregate_mapping",$2); }; + { $$=mkefuncallnode("aggregate_mapping",$3); }; | F_MULTISET_START expr_list F_MULTISET_END { $$=mkefuncallnode("aggregate_multiset",$2); } | expr4 F_ARROW F_IDENTIFIER