lib/parser/ruby19.y in parser-0.9.2 vs lib/parser/ruby19.y in parser-1.0.0

@@ -1258,51 +1258,51 @@
                 | f_marg_list tCOMMA tSTAR f_norm_arg
                     {
                       @static_env.declare val[3][0]
 
                       result = val[0].
-                                  push(@builder.splatarg(val[2], val[3]))
+                                  push(@builder.restarg(val[2], val[3]))
                     }
                 | f_marg_list tCOMMA tSTAR f_norm_arg tCOMMA f_marg_list
                     {
                       @static_env.declare val[3][0]
 
                       result = val[0].
-                                  push(@builder.splatarg(val[2], val[3])).
+                                  push(@builder.restarg(val[2], val[3])).
                                   concat(val[5])
                     }
                 | f_marg_list tCOMMA tSTAR
                     {
                       result = val[0].
-                                  push(@builder.splatarg(val[2]))
+                                  push(@builder.restarg(val[2]))
                     }
                 | f_marg_list tCOMMA tSTAR            tCOMMA f_marg_list
                     {
                       result = val[0].
-                                  push(@builder.splatarg(val[2])).
+                                  push(@builder.restarg(val[2])).
                                   concat(val[4])
                     }
                 |                    tSTAR f_norm_arg
                     {
                       @static_env.declare val[1][0]
 
-                      result = [ @builder.splatarg(val[0], val[1]) ]
+                      result = [ @builder.restarg(val[0], val[1]) ]
                     }
                 |                    tSTAR f_norm_arg tCOMMA f_marg_list
                     {
                       @static_env.declare val[1][0]
 
-                      result = [ @builder.splatarg(val[0], val[1]),
+                      result = [ @builder.restarg(val[0], val[1]),
                                  *val[3] ]
                     }
                 |                    tSTAR
                     {
-                      result = [ @builder.splatarg(val[0]) ]
+                      result = [ @builder.restarg(val[0]) ]
                     }
                 |                    tSTAR tCOMMA f_marg_list
                     {
-                      result = [ @builder.splatarg(val[0]),
+                      result = [ @builder.restarg(val[0]),
                                  *val[2] ]
                     }
 
      block_param: f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg              opt_f_block_arg
                     {
@@ -2044,15 +2044,15 @@
 
       f_rest_arg: restarg_mark tIDENTIFIER
                     {
                       @static_env.declare val[1][0]
 
-                      result = [ @builder.splatarg(val[0], val[1]) ]
+                      result = [ @builder.restarg(val[0], val[1]) ]
                     }
                 | restarg_mark
                     {
-                      result = [ @builder.splatarg(val[0]) ]
+                      result = [ @builder.restarg(val[0]) ]
                     }
 
      blkarg_mark: tAMPER2 | tAMPER
 
      f_block_arg: blkarg_mark tIDENTIFIER
@@ -2108,10 +2108,16 @@
       operation3: tIDENTIFIER | tFID | op
     dot_or_colon: tDOT | tCOLON2
        opt_terms:  | terms
           opt_nl:  | tNL
           rparen: opt_nl tRPAREN
+                    {
+                      result = val[1]
+                    }
         rbracket: opt_nl tRBRACK
+                    {
+                      result = val[1]
+                    }
          trailer:  | tNL | tCOMMA
 
             term: tSEMI
                   {
                     yyerrok