ruby_parser 3.0.0.a4 → 3.0.0.a5

data/History.txt

@@ -1,3 +1,13 @@
+=== 3.0.0.a5 / 2012-07-31
+
+* 5 bug fixes:
+
+  * 1.9: Fix construction of 'f(:x, y: nil,)' w/ trailing comma.
+  * 1.9: cleaned up lexing exit lex_state handling. Fixes bug parsing 'if f :x; end'
+  * 1.9: fixed building of right-leaning masgns: 'f { |a, (b, c)| }'
+  * 1.9: fixed lexing 'when *splat'
+  * 1.9: fixed lexing of regexps in whens
+
 === 3.0.0.a4 / 2012-07-26
 
 * 10 minor enhancements:

data/bin/ruby_parse_extract_error

@@ -42,7 +42,9 @@ ARGV.replace ARGV.map { |path|
   else
     path
   end
-}.flatten
+}.flatten.reject { |f|
+  f =~ /bad_ruby_file/ # I have intentionally bad code in my test dirs
+}
 
 parser = Ruby19Parser.new
 

data/lib/ruby19_parser.rb

@@ -4315,8 +4315,7 @@ def _reduce_250(val, _values, result)
 end
 
 def _reduce_251(val, _values, result)
-                      warning "parenthesize argument(s) for future version"
-                      result = val[0].add val[2]
+                      result = val[0] << s(:hash, *val[2][1..-1])
                     
     result
 end
@@ -5868,7 +5867,7 @@ def _reduce_526(val, _values, result)
 end
 
 def _reduce_527(val, _values, result)
-                      val[0] << val[2].to_sym
+                      val[0] << val[2]
                       result = val[0]
                     
     result

data/lib/ruby19_parser.y

@@ -809,8 +809,7 @@ rule
                     }
                 | args tCOMMA assocs tCOMMA
                     {
-                      warning "parenthesize argument(s) for future version"
-                      result = val[0].add val[2]
+                      result = val[0] << s(:hash, *val[2][1..-1])
                     }
                 | assocs tCOMMA
                     {
@@ -1909,7 +1908,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     }
                 | f_arg tCOMMA f_arg_item
                     {
-                      val[0] << val[2].to_sym
+                      val[0] << val[2]
                       result = val[0]
                     }
 

data/lib/ruby_lexer.rb

@@ -239,7 +239,7 @@ class RubyLexer
   end
 
   def lex_state= o
-    # warn "wtf lex_state = #{o.inspect}"
+    # warn "wtf lex_state = #{o.inspect} from #{caller.first}"
     raise "wtf\?" unless Symbol === o
     @lex_state = o
   end
@@ -485,6 +485,10 @@ class RubyLexer
     Ruby18Parser === parser
   end
 
+  def ruby19
+    Ruby19Parser === parser
+  end
+
   def src= src
     raise "bad src: #{src.inspect}" unless String === src
     @src = RPStringScanner.new(src)
@@ -769,15 +773,16 @@ class RubyLexer
           self.lex_state = :expr_dot
           self.yacc_value = "::"
           return :tCOLON2
-        elsif lex_state != :expr_end && lex_state != :expr_endarg && src.scan(/:([a-zA-Z_]\w*(?:[?!]|=(?!>))?)/) then
+        elsif ! is_end? && src.scan(/:([a-zA-Z_]\w*(?:[?!]|=(?!>))?)/) then
+          # scanning shortcut to symbols
           self.yacc_value = src[1]
           self.lex_state = :expr_end
           return :tSYMBOL
         elsif src.scan(/\:/) then
           # ?: / then / when
-          if (lex_state == :expr_end || lex_state == :expr_endarg||
-              src.check(/\s/)) then
+          if is_end? || src.check(/\s/) then
             self.lex_state = :expr_beg
+            # TODO warn_balanced(":", "symbol literal");
             self.yacc_value = ":"
             return :tCOLON
           end
@@ -933,7 +938,7 @@ class RubyLexer
             result = if lex_state.is_argument && space_seen && src.check(/\S/) then
                        warning("`*' interpreted as argument prefix")
                        :tSTAR
-                     elsif lex_state == :expr_beg || lex_state == :expr_mid then
+                     elsif is_beg? then
                        :tSTAR
                      else
                        :tSTAR2
@@ -1091,7 +1096,7 @@ class RubyLexer
             return result
           end
         elsif src.scan(/\//) then
-          if lex_state == :expr_beg || lex_state == :expr_mid then
+          if is_beg? then
             self.lex_strterm = [:strterm, STR_REGEXP, '/', "\0"]
             self.yacc_value = "/"
             return :tREGEXP_BEG
@@ -1394,17 +1399,19 @@ class RubyLexer
         end
       end
 
-      if (lex_state == :expr_beg || lex_state == :expr_mid ||
-          lex_state == :expr_dot || lex_state == :expr_arg ||
-          lex_state == :expr_cmdarg) then
-        if command_state then
-          self.lex_state = :expr_cmdarg
+      self.lex_state =
+        if is_beg? || lex_state == :expr_dot || is_arg? then
+          if command_state then
+            :expr_cmdarg
+          else
+            :expr_arg
+          end
+        elsif ruby19 && lex_state == :expr_fname then
+          :expr_endfn
         else
-          self.lex_state = :expr_arg
+          :expr_end
         end
-      else
-        self.lex_state = :expr_end
-      end
+
     end
 
     self.yacc_value = token

data/lib/ruby_parser_extras.rb

@@ -78,7 +78,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = '3.0.0.a4' unless constants.include? "VERSION" # SIGH
+  VERSION = '3.0.0.a5' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -201,7 +201,16 @@ module RubyParserStuff
       when Sexp then
         case v.first
         when :args then
-          r.concat v[1..-1].map { |s| s(:lasgn, s) }
+          r.concat v[1..-1].map { |s| # FIX: this is a smell
+            case s
+            when Symbol then
+              s(:lasgn, s)
+            when Sexp then
+              s
+            else
+              raise "unhandled type: #{s.inspect}"
+            end
+          }
         when :block_arg then
           r << s(:lasgn, :"&#{v.last}")
         when :masgn then
@@ -1221,6 +1230,7 @@ class Sexp
   end
 
   def to_sym
+    raise "no"
     self.value.to_sym
   end
 

data/test/test_ruby_parser.rb

@@ -646,16 +646,31 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
-  def test_bug_args_masgn
+  # according to 2.3.1 parser:
+  # rp.process("f { |(a,b),c| }") == rp.process("f { |((a,b),c)| }")
+
+  # def test_bug_args_masgn
+  #   rb = "f { |(a, b), c| }"
+  #   pt = s(:iter,
+  #          s(:call, nil, :f),
+  #          s(:masgn,
+  #            s(:array,
+  #              s(:masgn, s(:array, s(:lasgn, :a), s(:lasgn, :b))),
+  #              s(:lasgn, :c))))
+  # 
+  #   assert_parse rb, pt.dup
+  # end
+
+  def test_bug_args_masgn_outer_parens
     rb = "f { |((a, b), c)| }"
-    pt = s(:iter,
+    pt = s(:iter,               # NOTE: same sexp as test_bug_args_masgn
            s(:call, nil, :f),
            s(:masgn,
              s(:array,
                s(:masgn, s(:array, s(:lasgn, :a), s(:lasgn, :b))),
                s(:lasgn, :c))))
 
-    assert_parse rb, pt
+    assert_parse rb, pt.dup
   end
 
   # TODO:
@@ -675,16 +690,61 @@ module TestRubyParserShared
   #   assert_parse rb, pt
   # end
 
-  # TODO:
-  # def test_bug_comma
-  #   rb = "if test ?d, dir then end"
-  #   pt = s(:if,
-  #          s(:call, nil, :test, s(:lit, 100), s(:call, nil, :dir)),
-  #          nil,
-  #          nil)
-  #
-  #   assert_parse rb, pt
-  # end
+  def test_bug_comma
+    val = case self.processor
+          when Ruby18Parser then
+            s(:lit, 100)
+          when Ruby19Parser then
+            s(:str, "d")
+          else
+            raise "wtf"
+          end
+
+    rb = "if test ?d, dir then end"
+    pt = s(:if,
+           s(:call, nil, :test, val, s(:call, nil, :dir)),
+           nil,
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_bug_case_when_regexp
+    rb = "case :x; when /x/ then end"
+    pt = s(:case, s(:lit, :x),
+           s(:when, s(:array, s(:lit, /x/)), nil),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_bug_masgn_right
+    rb = "f { |a, (b, c)| }"
+    pt = s(:iter,
+           s(:call, nil, :f),
+           s(:masgn,
+             s(:array,
+               s(:lasgn, :a),
+               s(:masgn, s(:array, s(:lasgn, :b), s(:lasgn, :c))))))
+
+    assert_parse rb, pt
+  end
+
+  def test_when_splat
+    rb = "case a; when *b then; end"
+    pt = s(:case, s(:call, nil, :a),
+           s(:when, s(:array, s(:splat, s(:call, nil, :b))), nil),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_if_symbol
+    rb = "if f :x; end"
+    pt = s(:if, s(:call, nil, :f, s(:lit, :x)), nil, nil)
+
+    assert_parse rb, pt
+  end
 end
 
 class TestRubyParser < MiniTest::Unit::TestCase
@@ -1034,6 +1094,24 @@ class TestRuby19Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 
+  def test_bug_hash_args
+    rb = "foo(:bar, baz: nil)"
+    pt = s(:call, nil, :foo,
+           s(:lit, :bar),
+           s(:hash, s(:lit, :baz), s(:nil)))
+
+    assert_parse rb, pt
+  end
+
+  def test_bug_hash_args_trailing_comma
+    rb = "foo(:bar, baz: nil,)"
+    pt = s(:call, nil, :foo,    # NOTE: same sexp as test_bug_hash_args
+           s(:lit, :bar),
+           s(:hash, s(:lit, :baz), s(:nil)))
+
+    assert_parse rb, pt
+  end
+
   # HACK: need to figure out the desired structure and get this working
   # def test_wtf
   #   # lambda -> f_larglist lambda_body

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 1314497749
+  hash: -2559988010
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - a
-  - 4
-  version: 3.0.0.a4
+  - 5
+  version: 3.0.0.a5
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor