parser 0.9.2 → 1.0.0

data/lib/parser/ruby20.y

@@ -12,7 +12,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       tASET tLSHFT tRSHFT tCOLON2 tCOLON3 tOP_ASGN tASSOC tLPAREN
       tLPAREN2 tRPAREN tLPAREN_ARG tLBRACK tLBRACK2 tRBRACK tLBRACE
       tLBRACE_ARG tSTAR tSTAR2 tAMPER tAMPER2 tTILDE tPERCENT tDIVIDE
-      tPLUS tMINUS tLT tGT tPIPE tBANG tCARET tLCURLY tRCURLY
+      tDSTAR tPLUS tMINUS tLT tGT tPIPE tBANG tCARET tLCURLY tRCURLY
       tBACK_REF2 tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG tREGEXP_OPT
       tWORDS_BEG tQWORDS_BEG tSYMBOLS_BEG tQSYMBOLS_BEG tSTRING_DBEG
       tSTRING_DVAR tSTRING_END tSTRING_DEND tSTRING tSYMBOL
@@ -605,7 +605,7 @@ rule
                 |   tMATCH   | tNMATCH | tGT      | tGEQ  | tLT     | tLEQ
                 |   tNEQ     | tLSHFT  | tRSHFT   | tPLUS | tMINUS  | tSTAR2
                 |   tSTAR    | tDIVIDE | tPERCENT | tPOW  | tBANG   | tTILDE
-                |   tUPLUS   | tUMINUS | tAREF    | tASET | tBACK_REF2
+                |   tUPLUS   | tUMINUS | tAREF    | tASET | tDSTAR  | tBACK_REF2
 
         reswords: k__LINE__ | k__FILE__ | k__ENCODING__ | klBEGIN | klEND
                 | kALIAS    | kAND      | kBEGIN        | kBREAK  | kCASE
@@ -1285,58 +1285,85 @@ rule
                       @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
+ block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
+                    {
+                      result = val[0].concat(val[2]).concat(val[3])
+                    }
+                | f_block_kwarg opt_f_block_arg
+                    {
+                      result = val[0].concat(val[1])
+                    }
+                | f_kwrest opt_f_block_arg
+                    {
+                      result = val[0].concat(val[1])
+                    }
+                | f_block_arg
+                    {
+                      result = [ val[0] ]
+                    }
+
+opt_block_args_tail:
+                  tCOMMA block_args_tail
+                    {
+                      result = val[1]
+                    }
+                | # nothing
+                    {
+                      result = []
+                    }
+
+     block_param: f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg              opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_f_block_arg
+                | f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
@@ -1344,76 +1371,73 @@ rule
                                   concat(val[6]).
                                   concat(val[7])
                     }
-                | f_arg tCOMMA f_block_optarg                                opt_f_block_arg
+                | f_arg tCOMMA f_block_optarg                                opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                | f_arg tCOMMA f_block_optarg tCOMMA                   f_arg opt_f_block_arg
+                | f_arg tCOMMA f_block_optarg tCOMMA                   f_arg opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_arg tCOMMA                       f_rest_arg              opt_f_block_arg
+                | f_arg tCOMMA                       f_rest_arg              opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
                 | f_arg tCOMMA
-                | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_f_block_arg
+                | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_arg                                                      opt_f_block_arg
+                | f_arg                                                      opt_block_args_tail
                     {
                       result = val[0].concat(val[1])
                     }
-                | f_block_optarg tCOMMA f_rest_arg              opt_f_block_arg
+                | f_block_optarg tCOMMA              f_rest_arg              opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                | f_block_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_f_block_arg
+                | f_block_optarg tCOMMA              f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_block_optarg                                opt_f_block_arg
+                | f_block_optarg                                             opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[1])
                     }
-                | f_block_optarg tCOMMA                   f_arg opt_f_block_arg
+                | f_block_optarg tCOMMA                                f_arg opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                |                       f_rest_arg              opt_f_block_arg
+                |                                    f_rest_arg              opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[1])
                     }
-                |                       f_rest_arg tCOMMA f_arg opt_f_block_arg
+                |                                    f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                |                                                   f_block_arg
-                    {
-                      result = [ val[0] ]
-                    }
+                |                                                                block_args_tail
 
  opt_block_param: # nothing
                     {
@@ -1507,6 +1531,25 @@ rule
                       result = @builder.call_method(val[0], val[1], val[2],
                                   lparen_t, args, rparen_t)
                     }
+                | block_call dot_or_colon operation2 opt_paren_args brace_block
+                    {
+                      lparen_t, args, rparen_t = val[3]
+                      method_call = @builder.call_method(val[0], val[1], val[2],
+                                      lparen_t, args, rparen_t)
+
+                      begin_t, args, body, end_t = val[4]
+                      result      = @builder.block(method_call,
+                                      begin_t, args, body, end_t)
+                    }
+                | block_call dot_or_colon operation2 command_args do_block
+                    {
+                      method_call = @builder.call_method(val[0], val[1], val[2],
+                                      nil, val[3], nil)
+
+                      begin_t, args, body, end_t = val[4]
+                      result      = @builder.block(method_call,
+                                      begin_t, args, body, end_t)
+                    }
 
      method_call: fcall paren_args
                     {
@@ -1929,14 +1972,40 @@ keyword_variable: kNIL
                       @lexer.state = :expr_value
                     }
 
-          f_args: f_arg tCOMMA f_optarg tCOMMA f_rest_arg              opt_f_block_arg
+       args_tail: f_kwarg tCOMMA f_kwrest opt_f_block_arg
+                    {
+                      result = val[0].concat(val[2]).concat(val[3])
+                    }
+                | f_kwarg opt_f_block_arg
+                    {
+                      result = val[0].concat(val[1])
+                    }
+                | f_kwrest opt_f_block_arg
+                    {
+                      result = val[0].concat(val[1])
+                    }
+                | f_block_arg
+                    {
+                      result = [ val[0] ]
+                    }
+
+   opt_args_tail: tCOMMA args_tail
+                    {
+                      result = val[1]
+                    }
+                | # nothing
+                    {
+                      result = []
+                    }
+
+          f_args: f_arg tCOMMA f_optarg tCOMMA f_rest_arg              opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_arg tCOMMA f_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_f_block_arg
+                | f_arg tCOMMA f_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
@@ -1944,75 +2013,75 @@ keyword_variable: kNIL
                                   concat(val[6]).
                                   concat(val[7])
                     }
-                | f_arg tCOMMA f_optarg                                opt_f_block_arg
+                | f_arg tCOMMA f_optarg                                opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                | f_arg tCOMMA f_optarg tCOMMA                   f_arg opt_f_block_arg
+                | f_arg tCOMMA f_optarg tCOMMA                   f_arg opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_arg tCOMMA                 f_rest_arg              opt_f_block_arg
+                | f_arg tCOMMA                 f_rest_arg              opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                | f_arg tCOMMA                 f_rest_arg tCOMMA f_arg opt_f_block_arg
+                | f_arg tCOMMA                 f_rest_arg tCOMMA f_arg opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                | f_arg                                                opt_f_block_arg
+                | f_arg                                                opt_args_tail
                     {
                       result = val[0].
                                   concat(val[1])
                     }
-                |              f_optarg tCOMMA f_rest_arg              opt_f_block_arg
+                |              f_optarg tCOMMA f_rest_arg              opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                |              f_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_f_block_arg
+                |              f_optarg tCOMMA f_rest_arg tCOMMA f_arg opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[4]).
                                   concat(val[5])
                     }
-                |              f_optarg                                opt_f_block_arg
+                |              f_optarg                                opt_args_tail
                     {
                       result = val[0].
                                   concat(val[1])
                     }
-                |              f_optarg tCOMMA                   f_arg opt_f_block_arg
+                |              f_optarg tCOMMA                   f_arg opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                |                              f_rest_arg              opt_f_block_arg
+                |                              f_rest_arg              opt_args_tail
                     {
                       result = val[0].
                                   concat(val[1])
                     }
-                |                              f_rest_arg tCOMMA f_arg opt_f_block_arg
+                |                              f_rest_arg tCOMMA f_arg opt_args_tail
                     {
                       result = val[0].
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                |                                                          f_block_arg
+                |                                                          args_tail
                     {
-                      result = [ val[0] ]
+                      result = val[0]
                     }
                 | # nothing
                     {
@@ -2059,6 +2128,55 @@ keyword_variable: kNIL
                       result = val[0] << val[2]
                     }
 
+            f_kw: tLABEL arg_value
+                    {
+                      check_kwarg_name(val[0])
+
+                      @static_env.declare val[0][0]
+
+                      result = @builder.kwoptarg(val[0], val[1])
+                    }
+
+      f_block_kw: tLABEL primary_value
+                    {
+                      check_kwarg_name(val[0])
+
+                      @static_env.declare val[0][0]
+
+                      result = @builder.kwoptarg(val[0], val[1])
+                    }
+
+   f_block_kwarg: f_block_kw
+                    {
+                      result = [ val[0] ]
+                    }
+                | f_block_kwarg tCOMMA f_block_kw
+                    {
+                      result = val[0] << val[2]
+                    }
+
+         f_kwarg: f_kw
+                    {
+                      result = [ val[0] ]
+                    }
+                | f_kwarg tCOMMA f_kw
+                    {
+                      result = val[0] << val[2]
+                    }
+
+     kwrest_mark: tPOW | tDSTAR
+
+        f_kwrest: kwrest_mark tIDENTIFIER
+                    {
+                      @static_env.declare val[1][0]
+
+                      result = [ @builder.kwrestarg(val[0], val[1]) ]
+                    }
+                | kwrest_mark
+                    {
+                      result = [ @builder.kwrestarg(val[0]) ]
+                    }
+
            f_opt: tIDENTIFIER tEQL arg_value
                     {
                       @static_env.declare val[0][0]
@@ -2097,11 +2215,11 @@ keyword_variable: kNIL
                     {
                       @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
@@ -2153,6 +2271,10 @@ keyword_variable: kNIL
                       key = @builder.symbol(val[0])
                       result = @builder.pair(key, nil, val[1])
                     }
+                | tDSTAR arg_value
+                    {
+                      result = @builder.kwsplat(val[0], val[1])
+                    }
 
        operation: tIDENTIFIER | tCONSTANT | tFID
       operation2: tIDENTIFIER | tCONSTANT | tFID | op
@@ -2161,7 +2283,13 @@ keyword_variable: kNIL
        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

data/parser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'parser'
-  spec.version       = '0.9.2'
+  spec.version       = '1.0.0'
   spec.authors       = ['Peter Zotov']
   spec.email         = ['whitequark@whitequark.org']
   spec.description   = %q{A Ruby parser written in pure Ruby.}