RubyGems - ruby_parser - Versions diffs - 3.0.0.a9 → 3.0.0.a10 - Mend

ruby_parser 3.0.0.a9 → 3.0.0.a10

Potentially problematic release.

This version of ruby_parser might be problematic. Click here for more details.

Files changed (10) hide show

data.tar.gz.sig CHANGED Viewed

Binary file

data/History.txt CHANGED Viewed

@@ -1,3 +1,16 @@
+=== 3.0.0.a10 / 2012-10-26
+* 1 major enhancement:
+  * iter nodes are now structurally the same as defs. Block args are COMPLETELY different.
+* 4 minor enhancements:
+  * 1.8 and 1.9 now treat f { |(...)| } differently, per MRI.
+  * 1.9: Added __ENCODING__ support. (witlessbird)
+  * 1.9: Finished coverage for masgn variants in block args
+  * 1.9: covered all forms of block args: optional, splat, block, and destructuring
 === 3.0.0.a9 / 2012-10-22
 Holy crap! I've hit a 99.92% success rate against 558k files! 492

data/lib/ruby18_parser.rb CHANGED Viewed

@@ -4782,85 +4782,85 @@ def _reduce_340(val, _values, result)
 end
 def _reduce_341(val, _values, result)
-                      result = s(:array, val[0])
+                      result = s(:array, clean_mlhs(val[0]))
     result
 end
 def _reduce_342(val, _values, result)
-                      result = list_append val[0], val[2]
+                      result = list_append val[0], clean_mlhs(val[2])
     result
 end
 def _reduce_343(val, _values, result)
-                      result = block_var val[0], nil, nil
+                      result = block_var18 val[0], nil, nil
     result
 end
 def _reduce_344(val, _values, result)
-                      result = block_var val[0], nil, nil
+                      result = block_var18 val[0], nil, nil
     result
 end
 def _reduce_345(val, _values, result)
-                      result = block_var val[0], nil, val[3]
+                      result = block_var18 val[0], nil, val[3]
     result
 end
 def _reduce_346(val, _values, result)
-                      result = block_var val[0], val[3], val[6]
+                      result = block_var18 val[0], val[3], val[6]
     result
 end
 def _reduce_347(val, _values, result)
-                      result = block_var val[0], s(:splat), val[5]
+                      result = block_var18 val[0], s(:splat), val[5]
     result
 end
 def _reduce_348(val, _values, result)
-                      result = block_var val[0], val[3], nil
+                      result = block_var18 val[0], val[3], nil
     result
 end
 def _reduce_349(val, _values, result)
-                      result = block_var val[0], s(:splat), nil
+                      result = block_var18 val[0], s(:splat), nil
     result
 end
 def _reduce_350(val, _values, result)
-                      result = block_var nil, val[1], val[4]
+                      result = block_var18 nil, val[1], val[4]
     result
 end
 def _reduce_351(val, _values, result)
-                      result = block_var nil, s(:splat), val[3]
+                      result = block_var18 nil, s(:splat), val[3]
     result
 end
 def _reduce_352(val, _values, result)
-                      result = block_var nil, val[1], nil
+                      result = block_var18 nil, val[1], nil
     result
 end
 def _reduce_353(val, _values, result)
-                      result = block_var nil, s(:splat), nil
+                      result = block_var18 nil, s(:splat), nil
     result
 end
 def _reduce_354(val, _values, result)
-                      result = block_var nil, nil, val[1]
+                      result = block_var18 nil, nil, val[1]
     result
 end
@@ -5463,55 +5463,55 @@ def _reduce_458(val, _values, result)
 end
 def _reduce_459(val, _values, result)
-                      result = args val[0], val[2], val[4], val[5]
+                      result = args val
     result
 end
 def _reduce_460(val, _values, result)
-                      result = args val[0], val[2],    nil, val[3]
+                      result = args val
     result
 end
 def _reduce_461(val, _values, result)
-                      result = args val[0],    nil, val[2], val[3]
+                      result = args val
     result
 end
 def _reduce_462(val, _values, result)
-                      result = args val[0],    nil,    nil, val[1]
+                      result = args val
     result
 end
 def _reduce_463(val, _values, result)
-                      result = args    nil, val[0], val[2], val[3]
+                      result = args val
     result
 end
 def _reduce_464(val, _values, result)
-                      result = args    nil, val[0],    nil, val[1]
+                      result = args val
     result
 end
 def _reduce_465(val, _values, result)
-                      result = args    nil,    nil, val[0], val[1]
+                      result = args val
     result
 end
 def _reduce_466(val, _values, result)
-                      result = args    nil,    nil,    nil, val[0]
+                      result = args val
     result
 end
 def _reduce_467(val, _values, result)
-                      result = args    nil,    nil,    nil,    nil
+                      result = args val
     result
 end

data/lib/ruby18_parser.y CHANGED Viewed

@@ -1203,60 +1203,60 @@ rule
        block_par: mlhs_item
                     {
-                      result = s(:array, val[0])
+                      result = s(:array, clean_mlhs(val[0]))
                     }
                 | block_par tCOMMA mlhs_item
                     {
-                      result = list_append val[0], val[2]
+                      result = list_append val[0], clean_mlhs(val[2])
                     }
        block_var: block_par
                     {
-                      result = block_var val[0], nil, nil
+                      result = block_var18 val[0], nil, nil
                     }
                 | block_par tCOMMA
                     {
-                      result = block_var val[0], nil, nil
+                      result = block_var18 val[0], nil, nil
                     }
                 | block_par tCOMMA tAMPER lhs
                     {
-                      result = block_var val[0], nil, val[3]
+                      result = block_var18 val[0], nil, val[3]
                     }
                 | block_par tCOMMA tSTAR lhs tCOMMA tAMPER lhs
                     {
-                      result = block_var val[0], val[3], val[6]
+                      result = block_var18 val[0], val[3], val[6]
                     }
                 | block_par tCOMMA tSTAR tCOMMA tAMPER lhs
                     {
-                      result = block_var val[0], s(:splat), val[5]
+                      result = block_var18 val[0], s(:splat), val[5]
                     }
                 | block_par tCOMMA tSTAR lhs
                     {
-                      result = block_var val[0], val[3], nil
+                      result = block_var18 val[0], val[3], nil
                     }
                 | block_par tCOMMA tSTAR
                     {
-                      result = block_var val[0], s(:splat), nil
+                      result = block_var18 val[0], s(:splat), nil
                     }
                 | tSTAR lhs tCOMMA tAMPER lhs
                     {
-                      result = block_var nil, val[1], val[4]
+                      result = block_var18 nil, val[1], val[4]
                     }
                 | tSTAR tCOMMA tAMPER lhs
                     {
-                      result = block_var nil, s(:splat), val[3]
+                      result = block_var18 nil, s(:splat), val[3]
                     }
                 | tSTAR lhs
                     {
-                      result = block_var nil, val[1], nil
+                      result = block_var18 nil, val[1], nil
                     }
                 | tSTAR
                     {
-                      result = block_var nil, s(:splat), nil
+                      result = block_var18 nil, s(:splat), nil
                     }
                 | tAMPER lhs
                     {
-                      result = block_var nil, nil, val[1]
+                      result = block_var18 nil, nil, val[1]
                     }
                 ;
@@ -1682,39 +1682,39 @@ xstring_contents: none
           f_args: f_arg tCOMMA f_optarg tCOMMA f_rest_arg opt_f_block_arg
                     {
-                      result = args val[0], val[2], val[4], val[5]
+                      result = args val
                     }
                 | f_arg tCOMMA f_optarg                opt_f_block_arg
                     {
-                      result = args val[0], val[2],    nil, val[3]
+                      result = args val
                     }
                 | f_arg tCOMMA              f_rest_arg opt_f_block_arg
                     {
-                      result = args val[0],    nil, val[2], val[3]
+                      result = args val
                     }
                 | f_arg                             opt_f_block_arg
                     {
-                      result = args val[0],    nil,    nil, val[1]
+                      result = args val
                     }
                 |           f_optarg tCOMMA f_rest_arg opt_f_block_arg
                     {
-                      result = args    nil, val[0], val[2], val[3]
+                      result = args val
                     }
                 |           f_optarg                opt_f_block_arg
                     {
-                      result = args    nil, val[0],    nil, val[1]
+                      result = args val
                     }
                 |                        f_rest_arg opt_f_block_arg
                     {
-                      result = args    nil,    nil, val[0], val[1]
+                      result = args val
                     }
                 |                                       f_block_arg
                     {
-                      result = args    nil,    nil,    nil, val[0]
+                      result = args val
                     }
                 |
                     {
-                      result = args    nil,    nil,    nil,    nil
+                      result = args val
                     }
       f_norm_arg: tCONSTANT

data/lib/ruby19_parser.rb CHANGED Viewed

@@ -2417,7 +2417,7 @@ racc_reduce_table = [
   2, 151, :_reduce_351,
   1, 226, :_reduce_none,
   1, 226, :_reduce_353,
-  1, 261, :_reduce_354,
+  1, 261, :_reduce_none,
   3, 261, :_reduce_355,
   1, 264, :_reduce_356,
   3, 264, :_reduce_357,
@@ -3429,6 +3429,8 @@ end
 def _reduce_58(val, _values, result)
                       result = new_iter nil, val[2], val[4]
+                      result.line = val[1]
                       self.env.unextend
     result
@@ -4577,7 +4579,7 @@ def _reduce_297(val, _values, result)
 end
 def _reduce_298(val, _values, result)
-                      result = val[1]
+                      result = val[1] # TODO: fix lineno
     result
 end
@@ -4861,11 +4863,7 @@ def _reduce_353(val, _values, result)
     result
 end
-def _reduce_354(val, _values, result)
-                      result = assignable val[0]
-    result
-end
+# reduce 354 omitted
 def _reduce_355(val, _values, result)
                       result = val[1]
@@ -4886,159 +4884,161 @@ def _reduce_357(val, _values, result)
 end
 def _reduce_358(val, _values, result)
-                      result = block_var val[0], nil, nil
+                      args, = val
+                      result = block_var args
     result
 end
 def _reduce_359(val, _values, result)
-                      result = block_var val[0], val[3], nil
+                      args, _, _, splat = val
+                      result = block_var args, "*#{splat}".to_sym
     result
 end
 def _reduce_360(val, _values, result)
-                      raise "no10\non: #{val.inspect}"
+                      args, _, _, splat, _, args2 = val
+                      result = block_var args, "*#{splat}".to_sym, args2
     result
 end
 def _reduce_361(val, _values, result)
-                      raise "no11\non: #{val.inspect}"
+                      args, _, _ = val
+                      result = block_var args, :*
     result
 end
 def _reduce_362(val, _values, result)
-                      raise "no12\non: #{val.inspect}"
+                      args, _, _, _, args2 = val
+                      result = block_var args, :*, args2
     result
 end
 def _reduce_363(val, _values, result)
-                      raise "no13\non: #{val.inspect}"
+                      _, splat = val
+                      result = block_var :"*#{splat}"
     result
 end
 def _reduce_364(val, _values, result)
-                      raise "no14\non: #{val.inspect}"
+                      _, splat, _, args = val
+                      result = block_var :"*#{splat}", args
     result
 end
 def _reduce_365(val, _values, result)
-                      raise "no15\non: #{val.inspect}"
+                      result = block_var :*
     result
 end
 def _reduce_366(val, _values, result)
-                      raise "no16\non: #{val.inspect}"
+                      _, _, args = val
+                      result = block_var :*, args
     result
 end
 def _reduce_367(val, _values, result)
-                      result = block_args19 val, "1"
+                      result = args val
     result
 end
 def _reduce_368(val, _values, result)
-                      result = block_args19 val, "2"
+                      result = args val
     result
 end
 def _reduce_369(val, _values, result)
-                      arg, _, opt, block = val
-                      result = arg
-                      result.concat opt[1..-1].map { |s| s[1] }
-                      result << "&#{block.last}".to_sym if block
-                      result << opt
+                      result = args val
     result
 end
 def _reduce_370(val, _values, result)
-                      result = block_args19 val, "4"
+                      result = args val
     result
 end
 def _reduce_371(val, _values, result)
-                      result = block_args19 val, "5"
+                      result = args val
     result
 end
 def _reduce_372(val, _values, result)
-                      result = block_args19 val, "6"
+                      result = args val
     result
 end
 def _reduce_373(val, _values, result)
-                      result = block_args19 val, "7"
+                      result = args val
     result
 end
 def _reduce_374(val, _values, result)
-                      result = block_args19 val, "8"
+                      result = args val
     result
 end
 def _reduce_375(val, _values, result)
-                      result = block_args19 val, "9"
+                      result = args val
     result
 end
 def _reduce_376(val, _values, result)
-                      result = block_args19 val, "10"
+                      result = args val
     result
 end
 def _reduce_377(val, _values, result)
-                      opt, block = val
-                      result = s(:args)
-                      result.concat opt[1..-1].map { |s| s[1] }
-                      result << "&#{block.last}".to_sym if block
-                      result << opt
+                      result = args val
     result
 end
 def _reduce_378(val, _values, result)
-                      result = block_args19 val, "12"
+                      result = args val
     result
 end
 def _reduce_379(val, _values, result)
-                      result = block_args19 val, "13"
+                      result = args val
     result
 end
 def _reduce_380(val, _values, result)
-                      rest, _, args, block = val
-                      result = args
-                      result[1,0] = rest
-                      result << "&#{block.last}".to_sym if block
+                      result = args val
     result
 end
 def _reduce_381(val, _values, result)
-                      result = block_args19 val, "15"
+                      result = args val
     result
 end
@@ -5093,24 +5093,19 @@ end
 # reduce 392 omitted
 def _reduce_393(val, _values, result)
-                      case val[0].size
-                      when 1
-                        args = 0
-                      when 2
-                        args = s(:lasgn, val[0][1])
-                      else
-                        vars = val[0][1..-1].map { |name| s(:lasgn, name) }
-                        args = s(:masgn, s(:array, *vars))
-                      end
+                      args, body = val
+                      args = 0 if args == s(:args)
                       call = new_call nil, :lambda
-                      result = s(:iter, call, args, val[1])
+                      result = new_iter call, args, body
     result
 end
 def _reduce_394(val, _values, result)
                       result = val[1]
+                      raise "not yet: #{val.inspect}" if val[2]
     result
 end
@@ -5147,9 +5142,9 @@ def _reduce_399(val, _values, result)
 end
 def _reduce_400(val, _values, result)
-                      vars   = val[2]
+                      args   = val[2]
                       body   = val[4]
-                      result = new_iter nil, vars, body
+                      result = new_iter nil, args, body
                       result.line = val[1]
                       self.env.unextend
@@ -5257,12 +5252,12 @@ def _reduce_415(val, _values, result)
 end
 def _reduce_416(val, _values, result)
-                      # REFACTOR
-                      args   = val[2]
-                      body   = val[4]
+                      _, line, args, _, body, _ = val
                       result = new_iter nil, args, body
+                      result.line = line
                       self.env.unextend
-                      result.line = val[1]
     result
 end
@@ -5281,11 +5276,12 @@ def _reduce_418(val, _values, result)
 end
 def _reduce_419(val, _values, result)
-                      args = val[2]
-                      body = val[4]
+                      _, line, args, _, body, _ = val
                       result = new_iter nil, args, body
+                      result.line = line
                       self.env.unextend
-                      result.line = val[1]
     result
 end
@@ -5309,7 +5305,7 @@ end
 # reduce 423 omitted
 def _reduce_424(val, _values, result)
-                      klasses, var, body, rest = val[1], val[2], val[4], val[5]
+                      _, klasses, var, _, body, rest = val
                       klasses ||= s(:array)
                       klasses << node_assign(var, s(:gvar, :"$!")) if var
@@ -5345,11 +5341,9 @@ end
 # reduce 430 omitted
 def _reduce_431(val, _values, result)
-                      if (val[1] != nil) then
-                        result = val[1]
-                      else
-                        result = s(:nil)
-                      end
+                      _, body = val
+                      result = body || s(:nil)
     result
 end
@@ -5547,7 +5541,7 @@ def _reduce_463(val, _values, result)
                       when nil then
                         result = s(:evstr)
                       else
-                        raise "unknown rescue body: #{val[2].inspect}"
+                        raise "unknown string body: #{val[2].inspect}"
                       end
     result
@@ -5667,7 +5661,13 @@ def _reduce_489(val, _values, result)
 end
 def _reduce_490(val, _values, result)
- result = s(:str, "Unsupported!")
+                      result =
+                        if defined? Encoding then
+                          s(:const, Encoding::UTF_8)
+                        else
+                          s(:str, "Unsupported!")
+                        end
     result
 end
@@ -5747,91 +5747,91 @@ def _reduce_502(val, _values, result)
 end
 def _reduce_503(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_504(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_505(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_506(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_507(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_508(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_509(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_510(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_511(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_512(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_513(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_514(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_515(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_516(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
 def _reduce_517(val, _values, result)
-                      result = args19 val
+                      result = args val
     result
 end
@@ -5883,7 +5883,7 @@ def _reduce_526(val, _values, result)
                       case val[0]
                       when Symbol then
                         result = s(:args)
-                        result << val[0].to_sym
+                        result << val[0]
                       when Sexp then
                         result = val[0]
                       else
@@ -5894,8 +5894,15 @@ def _reduce_526(val, _values, result)
 end
 def _reduce_527(val, _values, result)
-                      val[0] << val[2]
-                      result = val[0]
+                      list, _, item = val
+                      if list.sexp_type == :args then
+                        result = list
+                      else
+                        result = s(:args, list)
+                      end
+                      result << item
     result
 end
@@ -5967,7 +5974,7 @@ def _reduce_540(val, _values, result)
                       identifier = val[1].to_sym
                       self.env[identifier] = :lvar
-                      result = s(:block_arg, identifier.to_sym)
+                      result = "&#{identifier}".to_sym
     result
 end