parser 2.5.0.1 → 2.5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee63d086cc3d7ade55f51e03ac92d6f88315fb7
-  data.tar.gz: 8efdd495d4866bfb27db7b0b15be94515b18a91f
+  metadata.gz: 1497971563a08dc36f4f331db195ebbe9d157082
+  data.tar.gz: 6af1b9d7f17195f6306c6de045c547ebc4dc77e4
 SHA512:
-  metadata.gz: ae6472a338db72f9d422633eeb83fb6ba37f3f07e99f89d8d2661b840a08177aaffb2ffa8677a7d826f86278c94ba2434b68e00e265d43e7da3ca4998fceeb49
-  data.tar.gz: 382b2d934d537bf496e74911a25a7caf286192955a50698f4a0c7b80d5b0f852feebd51d6beb0cd12381052960ab0c4687e26e965a43cab36269ec9919bf730e
+  metadata.gz: 0c87434346083e12a82d091d0e274ff0ef3766aac84704fad1d1b5f734bf1a884187c46570c474136bc04d0fb24122cdfc76eb5d32f0e4c79d1d31f986c8d110
+  data.tar.gz: bae16691e9e99837d7fc31551b31b4f2e98e0729ebf92a401a595b3b942e65de4b6819341e93e89c27cf9fa56951edd02b5201b63b77e9ec023e67e3b1f57768

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v2.5.0.2 (2018-02-22)
+---------------------
+
+Bugs fixed:
+ * ruby24.y, ruby25.y: Replicate cmdargs handling from MRI. (#453) (Ilya Bylich)
+
 v2.5.0.1 (2018-02-21)
 ---------------------
 

data/lib/parser/ruby24.y

@@ -955,20 +955,13 @@ rule
 
                       result = @builder.begin_keyword(val[0], val[2], val[3])
                     }
-                | tLPAREN_ARG
-                    {
-                      result = @lexer.cmdarg.dup
-                      @lexer.cmdarg.clear
-                    }
-                    stmt
+                | tLPAREN_ARG stmt
                     {
                       @lexer.state = :expr_endarg
                     }
                     rparen
                     {
-                      @lexer.cmdarg = val[1]
-
-                      result = @builder.begin(val[0], val[2], val[4])
+                      result = @builder.begin(val[0], val[1], val[3])
                     }
                 | tLPAREN_ARG
                     {

data/lib/parser/ruby25.y

@@ -965,20 +965,13 @@ rule
 
                       result = @builder.begin_keyword(val[0], val[2], val[3])
                     }
-                | tLPAREN_ARG
-                    {
-                      result = @lexer.cmdarg.dup
-                      @lexer.cmdarg.clear
-                    }
-                    stmt
+                | tLPAREN_ARG stmt
                     {
                       @lexer.state = :expr_endarg
                     }
                     rparen
                     {
-                      @lexer.cmdarg = val[1]
-
-                      result = @builder.begin(val[0], val[2], val[4])
+                      result = @builder.begin(val[0], val[1], val[3])
                     }
                 | tLPAREN_ARG
                     {

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.5.0.1'
+  VERSION = '2.5.0.2'
 end

data/test/parse_helper.rb

@@ -122,6 +122,9 @@ module ParseHelper
 
       assert_source_range(begin_pos, end_pos, range, version, line.inspect)
     end
+
+    assert_equal parser.instance_eval { @lexer }.cmdarg.instance_eval { @stack }, 0,
+      "(#{version}) expected cmdarg to be empty after parsing"
   end
 
   # Use like this:

data/test/test_parser.rb

@@ -6781,4 +6781,20 @@ class TestParser < Minitest::Test
       %q{},
       SINCE_1_9)
   end
+
+  def test_bug_452
+    assert_parses(
+      s(:begin,
+        s(:send, nil, :td,
+          s(:send,
+            s(:begin,
+              s(:int, 1500)), :toString)),
+        s(:block,
+          s(:send,
+            s(:send, nil, :td), :num),
+          s(:args), nil)),
+      %q{td (1_500).toString(); td.num do; end},
+      %q{},
+      ALL_VERSIONS)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.5.0.1
+  version: 2.5.0.2
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast