ruby_parser 3.8.3 → 3.8.4

data/lib/ruby23_parser.y

@@ -652,7 +652,7 @@ rule
                 | arg tDOT2 arg
                     {
                       v1, v2 = val[0], val[2]
-                      if v1.node_type == :lit and v2.node_type == :lit and Fixnum === v1.last and Fixnum === v2.last then
+                      if v1.node_type == :lit and v2.node_type == :lit and Integer === v1.last and Integer === v2.last then
                         result = s(:lit, (v1.last)..(v2.last))
                       else
                         result = s(:dot2, v1, v2)
@@ -661,7 +661,7 @@ rule
                 | arg tDOT3 arg
                     {
                       v1, v2 = val[0], val[2]
-                      if v1.node_type == :lit and v2.node_type == :lit and Fixnum === v1.last and Fixnum === v2.last then
+                      if v1.node_type == :lit and v2.node_type == :lit and Integer === v1.last and Integer === v2.last then
                         result = s(:lit, (v1.last)...(v2.last))
                       else
                         result = s(:dot3, v1, v2)
@@ -2216,7 +2216,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     }
                 | kwrest_mark
                     {
-                      debug20 36, val, result
+                      result = :"**"
                     }
 
            f_opt: f_arg_asgn tEQL arg_value

data/lib/ruby_lexer.rb

@@ -788,7 +788,7 @@ class RubyLexer
       else
         result(state, :kDO, value)
       end
-    when in_lex_state?(:expr_beg, :expr_value) then # TODO: :expr_labelarg
+    when in_lex_state?(:expr_beg, :expr_value, :expr_labelarg) then
       result(state, keyword.id0, value)
     when keyword.id0 != keyword.id1 then
       result(:expr_beg, keyword.id1, value)

data/lib/ruby_lexer.rex.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.4.1.
+# Generated by: oedipus_lex version 2.5.0.
 # Source: lib/ruby_lexer.rex
 #++
 

data/lib/ruby_parser.yy

@@ -675,7 +675,7 @@ rule
                 | arg tDOT2 arg
                     {
                       v1, v2 = val[0], val[2]
-                      if v1.node_type == :lit and v2.node_type == :lit and Fixnum === v1.last and Fixnum === v2.last then
+                      if v1.node_type == :lit and v2.node_type == :lit and Integer === v1.last and Integer === v2.last then
                         result = s(:lit, (v1.last)..(v2.last))
                       else
                         result = s(:dot2, v1, v2)
@@ -684,7 +684,7 @@ rule
                 | arg tDOT3 arg
                     {
                       v1, v2 = val[0], val[2]
-                      if v1.node_type == :lit and v2.node_type == :lit and Fixnum === v1.last and Fixnum === v2.last then
+                      if v1.node_type == :lit and v2.node_type == :lit and Integer === v1.last and Integer === v2.last then
                         result = s(:lit, (v1.last)...(v2.last))
                       else
                         result = s(:dot3, v1, v2)
@@ -2287,7 +2287,7 @@ keyword_variable: kNIL      { result = s(:nil)   }
                     }
                 | kwrest_mark
                     {
-                      debug20 36, val, result
+                      result = :"**"
                     }
 
 #if defined(RUBY20)

data/lib/ruby_parser_extras.rb

@@ -91,7 +91,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = "3.8.3" unless constants.include? "VERSION" # SIGH
+  VERSION = "3.8.4" unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -109,7 +109,7 @@ module RubyParserStuff
 
   ruby19 = "".respond_to? :encoding
 
-  # Rhis is in sorted order of occurrence according to
+  # This is in sorted order of occurrence according to
   # charlock_holmes against 500k files, with UTF_8 forced
   # to the top.
   #

data/test/test_ruby_parser.rb

@@ -2083,6 +2083,13 @@ module TestRubyParserShared19to22
     assert_parse rb, pt
   end
 
+  def test_call_assoc_new_if_multiline
+    rb = "a(b: if :c\n1\nelse\n2\nend)"
+    pt = s(:call, nil, :a, s(:hash, s(:lit, :b), s(:if, s(:lit, :c), s(:lit, 1), s(:lit, 2))))
+
+    assert_parse rb, pt
+  end
+
   def test_do_lambda
     rb = "->() do end"
     pt = s(:iter, s(:call, nil, :lambda), s(:args))
@@ -2255,6 +2262,13 @@ module TestRubyParserShared20to22
     assert_parse rb, pt
   end
 
+  def test_defn_kwarg_kwsplat_anon
+    rb = "def a(b: 1, **) end"
+    pt = s(:defn, :a, s(:args, s(:kwarg, :b, s(:lit, 1)), :"**"), 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"),

data/test/test_ruby_parser_extras.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'minitest/autorun'
 require 'ruby_parser_extras'
 
-require 'minitest/unit'
+require 'minitest/test'
 
 class TestStackState < Minitest::Test
   attr_reader :s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.4
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,92 +30,92 @@ cert_chain:
   E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
   fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '11'
 - !ruby/object:Gem::Dependency
   name: oedipus_lex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 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
@@ -150,14 +150,14 @@ executables:
 - ruby_parse_extract_error
 extensions: []
 extra_rdoc_files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 files:
-- .autotest
-- History.txt
+- ".autotest"
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/ruby_parse
 - bin/ruby_parse_extract_error
@@ -189,23 +189,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
-- README.txt
+- "--main"
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which