ruby_parser 3.10.1 → 3.11.0

data/lib/ruby_lexer.rb

@@ -548,7 +548,7 @@ class RubyLexer
     self.lineno += matched.lines.to_a.size if scan(/\n+/)
 
     return if in_lex_state?(:expr_beg, :expr_value, :expr_class,
-                            :expr_fname, :expr_dot, :expr_labelarg)
+                            :expr_fname, :expr_dot)
 
     if scan(/([\ \t\r\f\v]*)(\.|&)/) then
       self.space_seen = true unless ss[1].empty?
@@ -1042,7 +1042,13 @@ class RubyLexer
     when scan(/\\[McCx]/) then
       rb_compile_error "Invalid escape character syntax"
     when scan(/\\(.)/m) then
-      self.string_buffer << matched
+      chr = ss[1]
+      prev = self.string_buffer.last
+      if term == chr && prev && prev.end_with?("(?") then
+        self.string_buffer << chr
+      else
+        self.string_buffer << matched
+      end
     else
       rb_compile_error "Invalid escape character syntax"
     end

data/lib/ruby_parser.rb

@@ -72,10 +72,12 @@ require "ruby21_parser"
 require "ruby22_parser"
 require "ruby23_parser"
 require "ruby24_parser"
+require "ruby25_parser"
 
 class RubyParser # HACK
   VERSIONS.clear # also a HACK caused by racc namespace issues
 
+  class V25 < ::Ruby25Parser; end
   class V24 < ::Ruby24Parser; end
   class V23 < ::Ruby23Parser; end
   class V22 < ::Ruby22Parser; end

data/lib/ruby_parser.yy

@@ -10,6 +10,8 @@ class Ruby22Parser
 class Ruby23Parser
 #elif V == 24
 class Ruby24Parser
+#elif V == 25
+class Ruby25Parser
 #else
 fail "version not specified or supported on code generation"
 #endif
@@ -2418,9 +2420,9 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     {
                       result = s(:array, val[0], val[2])
                     }
-                | tLABEL arg_value
+                | tLABEL opt_nl arg_value
                     {
-                      result = s(:array, s(:lit, val[0][0].to_sym), val[1])
+                      result = s(:array, s(:lit, val[0][0].to_sym), val.last)
                     }
 #if V >= 22
                 | tSTRING_BEG string_contents tLABEL_END arg_value

data/lib/ruby_parser_extras.rb

@@ -7,7 +7,7 @@ require "rp_extensions"
 require "rp_stringscanner"
 
 module RubyParserStuff
-  VERSION = "3.10.1"
+  VERSION = "3.11.0"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -437,12 +437,7 @@ module RubyParserStuff
   def new_aref val
     val[2] ||= s(:arglist)
     val[2].sexp_type = :arglist if val[2].sexp_type == :array # REFACTOR
-    if val[0].node_type == :self then
-      result = new_call nil, :"[]", val[2]
-    else
-      result = new_call val[0], :"[]", val[2]
-    end
-    result
+    new_call val[0], :"[]", val[2]
   end
 
   def new_body val

data/test/test_ruby_lexer.rb

@@ -2053,6 +2053,14 @@ class TestRubyLexer < Minitest::Test
                 :tREGEXP_END,     "",            :expr_end)
   end
 
+  def test_yylex_regexp_escaped_delim
+    assert_lex3("%r!blah(?\\!blah)!",
+                nil,
+                :tREGEXP_BEG,     "%r\000",       :expr_beg,
+                :tSTRING_CONTENT, "blah(?!blah)", :expr_beg,
+                :tREGEXP_END,     "",             :expr_end)
+  end
+
   def test_yylex_regexp_escape_backslash_terminator_meta1
     assert_lex3("%r{blah\\}blah}",
                 nil,
@@ -2797,6 +2805,20 @@ class TestRubyLexer < Minitest::Test
                :tRCURLY, "}", :expr_endarg,   0, 0)
   end
 
+  def test_yylex_required_kwarg_no_value_22
+    setup_lexer_class RubyParser::V22
+
+    assert_lex3("def foo a:, b:\nend",
+                nil,
+                :kDEF, "def", :expr_fname,
+                :tIDENTIFIER, "foo", :expr_endfn,
+                :tLABEL, "a",   :expr_labelarg,
+                :tCOMMA, ",", :expr_beg,
+                :tLABEL, "b",   :expr_labelarg,
+                :tNL, nil, :expr_beg,
+                :kEND, "end", :expr_end)
+  end
+
   def test_ruby21_rational_literal
     setup_lexer_class RubyParser::V21
 

data/test/test_ruby_parser.rb

@@ -171,6 +171,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_call_self_brackets
+    rb = "self[1]"
+    pt = s(:call, s(:self), :[], s(:lit, 1))
+
+    assert_parse rb, pt
+  end
+
   def test_dasgn_icky2
     rb = "a do\n  v = nil\n  begin\n    yield\n  rescue Exception => v\n    break\n  end\nend"
     pt = s(:iter,
@@ -3419,6 +3426,17 @@ module TestRubyParserShared23Plus
     assert_parse rb, pt
   end
 
+  def test_required_kwarg_no_value
+    rb = "def x a:, b:\nend"
+    pt = s(:defn, :x,
+           s(:args,
+             s(:kwarg, :a),
+             s(:kwarg, :b)),
+           s(:nil))
+
+    assert_parse rb, pt
+  end
+
   def test_slashy_newlines_within_string
     rb = %(puts "hello\\
  my\\
@@ -3443,6 +3461,10 @@ module TestRubyParserShared24Plus
   # ...version specific tests to go here...
 end
 
+module TestRubyParserShared25Plus
+  # ...version specific tests to go here...
+end
+
 class TestRubyParser < Minitest::Test
   def test_cls_version
     assert_equal 18, RubyParser::V18.version
@@ -3729,6 +3751,23 @@ class TestRubyParserV24 < RubyParserTestCase
   end
 end
 
+class TestRubyParserV25 < RubyParserTestCase
+  include TestRubyParserShared
+  include TestRubyParserShared19Plus
+  include TestRubyParserShared20Plus
+  include TestRubyParserShared21Plus
+  include TestRubyParserShared22Plus
+  include TestRubyParserShared23Plus
+  include TestRubyParserShared24Plus
+  include TestRubyParserShared25Plus
+
+  def setup
+    super
+
+    self.processor = RubyParser::V25.new
+  end
+end
+
 RubyParser::VERSIONS.each do |klass|
   v = klass.version
   describe "block args arity #{v}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.11.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,17 +20,16 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
+  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
+  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
+  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
+  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
+  V+HB+LYYhXWitInO/eXxDrFB
   -----END CERTIFICATE-----
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -78,16 +77,22 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +184,8 @@ files:
 - lib/ruby23_parser.y
 - lib/ruby24_parser.rb
 - lib/ruby24_parser.y
+- lib/ruby25_parser.rb
+- lib/ruby25_parser.y
 - lib/ruby_lexer.rb
 - lib/ruby_lexer.rex
 - lib/ruby_lexer.rex.rb
@@ -210,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which