ruby_parser 3.4.1 → 3.5.0

data/lib/ruby_parser.rb

@@ -1,4 +1,5 @@
 require 'ruby18_parser'
 require 'ruby19_parser'
 require 'ruby20_parser'
+require 'ruby21_parser'
 require 'ruby_parser_extras'

data/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.4.1" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.5.0" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -240,6 +240,8 @@ module RubyParserStuff
           raise "unhandled: #{arg.sexp_type} in #{args.inspect}"
         end
       when Symbol then
+        name = arg.to_s.delete("&*")
+        self.env[name.to_sym] = :lvar unless name.empty?
         result << arg
       when ",", "|", ";", "(", ")", nil then
         # ignore
@@ -404,7 +406,7 @@ module RubyParserStuff
   def initialize(options = {})
     super()
 
-    v = self.class.name[/1[89]|20/]
+    v = self.class.name[/1[89]|2[01]/]
 
     self.lexer = RubyLexer.new v && v.to_i
     self.lexer.parser = self
@@ -688,6 +690,12 @@ module RubyParserStuff
     result
   end
 
+  def new_masgn_arg rhs, wrap = false
+    rhs = value_expr(rhs)
+    rhs = s(:to_ary, rhs) if wrap # HACK: could be array if lhs isn't right
+    rhs
+  end
+
   def new_masgn lhs, rhs, wrap = false
     rhs = value_expr(rhs)
     rhs = lhs[1] ? s(:to_ary, rhs) : s(:array, rhs) if wrap
@@ -1290,6 +1298,10 @@ module RubyParserStuff
   end
 end
 
+class Ruby21Parser < Racc::Parser
+  include RubyParserStuff
+end
+
 class Ruby20Parser < Racc::Parser
   include RubyParserStuff
 end
@@ -1314,16 +1326,19 @@ class RubyParser
     @p18 = Ruby18Parser.new
     @p19 = Ruby19Parser.new
     @p20 = Ruby20Parser.new
+    @p21 = Ruby21Parser.new
   end
 
-  def process(s, f = "(string)", t = 10) # parens for emacs *sigh*
-    @p20.process s, f, t
-  rescue Racc::ParseError, RubyParser::SyntaxError
-    begin
-      @p19.process s, f, t
-    rescue Racc::ParseError, RubyParser::SyntaxError
-      @p18.process s, f, t
+  def process s, f = "(string)", t = 10
+    e = nil
+    [@p21, @p20, @p19, @p18].each do |parser|
+      begin
+        return parser.process s, f, t
+      rescue Racc::ParseError, RubyParser::SyntaxError => exc
+        e = exc
+      end
     end
+    raise e
   end
 
   alias :parse :process
@@ -1331,6 +1346,8 @@ class RubyParser
   def reset
     @p18.reset
     @p19.reset
+    @p20.reset
+    @p21.reset
   end
 
   def self.for_current_ruby
@@ -1341,6 +1358,8 @@ class RubyParser
       Ruby19Parser.new
     when /^2.0/ then
       Ruby20Parser.new
+    when /^2.1/ then
+      Ruby21Parser.new
     else
       raise "unrecognized RUBY_VERSION #{RUBY_VERSION}"
     end

data/test/test_ruby_lexer.rb

@@ -2611,4 +2611,27 @@ class TestRubyLexer < Minitest::Test
                  :tSTRING_END,     nil,   :expr_end, 0, 0)
     end
   end
+
+  def test_ruby21_new_numbers
+    skip "Don't have imaginary and rational literal lexing yet"
+
+    setup_lexer_class Ruby21Parser
+
+    assert_lex3("10r",      nil, :tRATIONAL, "10r", :expr_end)
+    assert_lex3("1.5r",     nil, :tRATIONAL, "1.5r", :expr_end)
+
+    assert_lex3("1i",       nil, :tIMAGINARY, "1i", :expr_end)
+    assert_lex3("1+2i",     nil, :tIMAGINARY, "1+2i", :expr_end)
+    assert_lex3("1.2+3.4i", nil, :tIMAGINARY, "1.2+3.4i", :expr_end)
+    assert_lex3("4r+3i",    nil, :tIMAGINARY, "4r+3i", :expr_end)
+    assert_lex3("4r+3ri",   nil, :tIMAGINARY, "4r+3i", :expr_end)
+
+    assert_lex3("4i+3r",    nil, :tIMAGINARY, "4r+3i", :expr_end) # HACK
+    assert_lex3("1i+2ri",   nil, :tIMAGINARY, "4r+3i", :expr_end) # HACK
+
+    assert_lex3("1+2ri",    nil, :tIMAGINARY, "1+3ri", :expr_end)
+    refute_lex("1+2ir", :tINTEGER, 1)
+
+    flunk
+  end
 end

data/test/test_ruby_parser.rb

@@ -720,6 +720,18 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_parse_line_heredoc_evstr
+    skip "heredoc line numbers are just gonna be screwed for a while..."
+
+    rb = "<<-A\na\n\#{b}\nA"
+    pt = s(:dstr, "a\n",
+           s(:evstr,
+             s(:call, nil, :b).line(3)),
+             s(:str, "\n")).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_iter_call_parens
     rb = "f(a) do |x, y|\n  x + y\nend"
 
@@ -874,13 +886,15 @@ module TestRubyParserShared
     Ruby20Parser === self.processor
   end
 
+  def ruby21
+    Ruby21Parser === self.processor
+  end
+
   def test_bug_comma
     val = if ruby18 then
             s(:lit, 100)
-          elsif ruby19  or ruby20 then
-            s(:str, "d")
           else
-            raise "wtf"
+            s(:str, "d")
           end
 
     rb = "if test ?d, dir then end"
@@ -931,7 +945,7 @@ module TestRubyParserShared
     rb = "not(a)"
     pt = if ruby18 then
            s(:not, s(:call, nil, :a))
-         elsif ruby19 or ruby20 then
+         elsif ruby19 or ruby20 or ruby21 then
            s(:call, s(:call, nil, :a), :"!")
          else
            raise "wtf"
@@ -1333,15 +1347,6 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
-  def test_aref_args_lit_assocs
-    skip if ruby18
-
-    rb = "[1, 2 => 3]"
-    pt = s(:array, s(:lit, 1), s(:hash, s(:lit, 2), s(:lit, 3)))
-
-    assert_parse rb, pt
-  end
-
   def test_BEGIN
     rb = "BEGIN { 42 }"
     pt = s(:iter, s(:preexe), s(:args), s(:lit, 42))
@@ -1402,15 +1407,6 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
-  def test_block_decomp_arg_splat
-    skip "not that smart yet" if ruby18 # HACK
-
-    rb = "a { |(b, *)| }"
-    pt = s(:iter, s(:call, nil, :a), s(:args, s(:masgn, :b, :*)))
-
-    assert_parse rb, pt
-  end
-
   def test_masgn_arg_ident
     rb = "a, b.C = d"
     pt = s(:masgn,
@@ -1543,7 +1539,21 @@ module TestRubyParserShared
   end
 end
 
-module TestRubyParserShared1920
+module TestRubyParserShared19to21
+  def test_aref_args_lit_assocs
+    rb = "[1, 2 => 3]"
+    pt = s(:array, s(:lit, 1), s(:hash, s(:lit, 2), s(:lit, 3)))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_decomp_arg_splat
+    rb = "a { |(b, *)| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:masgn, :b, :*)))
+
+    assert_parse rb, pt
+  end
+
   def test_block_call_operation_dot
     rb = "a.b c do end.d"
     pt = s(:call,
@@ -2015,9 +2025,8 @@ module TestRubyParserShared1920
   end
 
   def test_mlhs_keyword
-    skip "Breaks on 1.9 and 2.0 parser but valid" # HACK
     rb = "a.!=(true, true)"
-    pt = 42
+    pt = s(:call, s(:call, nil, :a), :"!=", s(:true), s(:true))
 
     assert_parse rb, pt
   end
@@ -2030,6 +2039,70 @@ module TestRubyParserShared1920
   end
 end
 
+module TestRubyParserShared20to21
+  def test_defn_kwarg_kwsplat
+    rb = "def a(b: 1, **c) end"
+    pt = s(:defn, :a, s(:args, s(:kwarg, :b, s(:lit, 1)), :"**c"), s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_kwarg_env
+    rb = "def test(**testing) test_splat(**testing) end"
+    pt = s(:defn, :test, s(:args, :"**testing"),
+           s(:call, nil, :test_splat, s(:kwsplat, s(:lvar, :testing))))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_arg_kwsplat
+    rb = "a(b, **1)"
+    pt = s(:call, nil, :a, s(:call, nil, :b), s(:kwsplat, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_kwsplat
+    rb = "a(**1)"
+    pt = s(:call, nil, :a, s(:kwsplat, s(:lit, 1)))
+
+    assert_parse rb, pt
+  end
+
+  def test_iter_kwarg
+    rb = "a { |b: 1| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1))))
+
+    assert_parse rb, pt
+  end
+
+  def test_iter_kwarg_kwsplat
+    rb = "a { |b: 1, **c| }"
+    pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1)), :"**c"))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_kwarg_lvar
+    rb = "bl { |kw: :val| kw }"
+    pt = s(:iter, s(:call, nil, :bl), s(:args, s(:kwarg, :kw, s(:lit, :val))),
+           s(:lvar, :kw))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_kwarg_lvar_multiple
+    rb = "bl { |kw: :val, kw2: :val2 | kw }"
+    pt = s(:iter, s(:call, nil, :bl),
+           s(:args,
+             s(:kwarg, :kw, s(:lit, :val)),
+             s(:kwarg, :kw2, s(:lit, :val2))),
+           s(:lvar, :kw))
+
+    assert_parse rb, pt
+  end
+end
+
 class TestRubyParser < Minitest::Test
   def test_parse
     processor = RubyParser.new
@@ -2268,7 +2341,7 @@ end
 
 class TestRuby19Parser < RubyParserTestCase
   include TestRubyParserShared
-  include TestRubyParserShared1920
+  include TestRubyParserShared19to21
 
   def setup
     super
@@ -2868,7 +2941,8 @@ end
 
 class TestRuby20Parser < RubyParserTestCase
   include TestRubyParserShared
-  include TestRubyParserShared1920
+  include TestRubyParserShared20to21
+  include TestRubyParserShared19to21
 
   def setup
     super
@@ -2946,14 +3020,6 @@ class TestRuby20Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 
-  def test_block_kwarg_lvar
-    rb = "bl { |kw: :val| kw }"
-    pt = s(:iter, s(:call, nil, :bl), s(:args, s(:kwarg, :kw, s(:lit, :val))),
-           s(:lvar, :kw))
-
-    assert_parse rb, pt
-  end
-
   def test_defn_powarg
     rb = "def f(**opts) end"
     pt = s(:defn, :f, s(:args, :"**opts"), s(:nil))
@@ -3027,54 +3093,58 @@ class TestRuby20Parser < RubyParserTestCase
     assert_parse rb, pt
   end
 
-  def test_defn_unary_not # TODO: this needs to work on 1.9
-    skip "Not yet"
+  def test_defn_unary_not
     rb = "def !@; true; end" # I seriously HATE this
     pt = s(:defn, :"!@", s(:args), s(:true))
 
     assert_parse rb, pt
   end
 
-  def test_defn_kwarg_kwsplat
-    rb = "def a(b: 1, **c) end"
-    pt = s(:defn, :a, s(:args, s(:kwarg, :b, s(:lit, 1)), :"**c"), s(:nil))
+  def test_iter_array_curly
+    rb = "f :a, [:b] { |c, d| }" # yes, this is bad code... that's their problem
+    pt = s(:iter,
+           s(:call, nil, :f, s(:lit, :a), s(:array, s(:lit, :b))),
+           s(:args, :c, :d))
 
     assert_parse rb, pt
   end
+end
 
-  def test_call_arg_kwsplat
-    rb = "a(b, **1)"
-    pt = s(:call, nil, :a, s(:call, nil, :b), s(:kwsplat, s(:lit, 1)))
+class TestRuby21Parser < RubyParserTestCase
+  include TestRubyParserShared
+  include TestRubyParserShared19to21
+  include TestRubyParserShared20to21
 
-    assert_parse rb, pt
+  def setup
+    super
+
+    self.processor = Ruby21Parser.new
   end
 
-  def test_call_kwsplat
-    rb = "a(**1)"
-    pt = s(:call, nil, :a, s(:kwsplat, s(:lit, 1)))
+  def test_f_kw
+    rb = "def x k:42; end"
+    pt = s(:defn, :x, s(:args, s(:kwarg, :k, s(:lit, 42))), s(:nil))
 
     assert_parse rb, pt
   end
 
-  def test_iter_kwarg
-    rb = "a { |b: 1| }"
-    pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1))))
+  def test_f_kw__required
+    rb = "def x k:; end"
+    pt = s(:defn, :x, s(:args, s(:kwarg, :k)), s(:nil))
 
     assert_parse rb, pt
   end
 
-  def test_iter_kwarg_kwsplat
-    rb = "a { |b: 1, **c| }"
-    pt = s(:iter, s(:call, nil, :a), s(:args, s(:kwarg, :b, s(:lit, 1)), :"**c"))
+  def test_block_kw
+    rb = "-> (k:42) { }"
+    pt = s(:iter, s(:call, nil, :lambda), s(:args, s(:kwarg, :k, s(:lit, 42))))
 
     assert_parse rb, pt
   end
 
-  def test_iter_array_curly
-    rb = "f :a, [:b] { |c, d| }" # yes, this is bad code... that's their problem
-    pt = s(:iter,
-           s(:call, nil, :f, s(:lit, :a), s(:array, s(:lit, :b))),
-           s(:args, :c, :d))
+  def test_block_kw__required
+    rb = "-> (k:) { }"
+    pt = s(:iter, s(:call, nil, :lambda), s(:args, s(:kwarg, :k)))
 
     assert_parse rb, pt
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
   racc--which does by default use a C extension). RP's output is
@@ -182,6 +182,8 @@ files:
 - lib/ruby19_parser.y
 - lib/ruby20_parser.rb
 - lib/ruby20_parser.y
+- lib/ruby21_parser.rb
+- lib/ruby21_parser.y
 - lib/ruby_lexer.rb
 - lib/ruby_lexer.rex
 - lib/ruby_lexer.rex.rb
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ruby_parser
+rubyforge_project: 
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4