diff --git a/ChangeLog b/ChangeLog index 0894237eb8..9e423799d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Tue Oct 3 21:04:29 2006 Yukihiro Matsumoto * parse.y (dyna_in_block): inline using macro. + * parse.y (mlhs): simplifies the rule a bit. + Tue Oct 3 02:31:13 2006 Yukihiro Matsumoto * eval.c (splat_value): use "to_splat" instead of "to_ary" to diff --git a/parse.y b/parse.y index c0bdcfdbcd..3864f5aaf9 100644 --- a/parse.y +++ b/parse.y @@ -542,7 +542,7 @@ static void ripper_compile_error(struct parser_params*, const char *fmt, ...); %type for_var block_param opt_block_param block_param_def block_param0 %type opt_bv_decl bv_decls bv_decl lambda f_larglist lambda_body %type brace_block cmd_brace_block do_block lhs none fitem -%type mlhs mlhs_head mlhs_basic mlhs_entry mlhs_item mlhs_node mlhs_post +%type mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post %type fsym variable sym symbol operation operation2 operation3 %type cname fname op f_norm_arg %type f_arg @@ -1225,18 +1225,7 @@ command : operation command_args %prec tLOWEST ; mlhs : mlhs_basic - | tLPAREN mlhs_entry rparen - { - /*%%%*/ - $$ = $2; - /*% - $$ = dispatch1(mlhs_paren, $2); - %*/ - } - ; - -mlhs_entry : mlhs_basic - | tLPAREN mlhs_entry rparen + | tLPAREN mlhs rparen { /*%%%*/ $$ = NEW_MASGN(NEW_LIST($2), 0); @@ -1329,7 +1318,7 @@ mlhs_basic : mlhs_head ; mlhs_item : mlhs_node - | tLPAREN mlhs_entry rparen + | tLPAREN mlhs rparen { /*%%%*/ $$ = $2;