parser 2.7.0.1 → 2.7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 343568dc3db7c4cb37b68cdef2a241b86e639fea958156014ab0b701b0d04426
-  data.tar.gz: 320c9f744d2ae76c16efb8e70f021ae35faa8bc89251ff211690085cdf7f2fe3
+  metadata.gz: eb64651ef64daa71d4c55d8ab253c90ce470eaf85f3b0ce98dfe5f171a681c80
+  data.tar.gz: a875a3b5c4a92b7fae3a58c379c300519e7c328641a7cb8d8a65e3f131118eed
 SHA512:
-  metadata.gz: dc4f82ed4f56061e57952b794f44d039d456bf43b2e805020233e20569908ce95e788520b2642c33bc2838860a80fe5308959fc3c994bcbc48739ca1ca3aed6a
-  data.tar.gz: 4b4cc6603bef9ca16925bcb009d0b1ed17c3fb22125a0c2b8eb2ea6c631664cea26e466aa7bacbff9b73040a37341cc107f678edc5f81c22745086b011b46b6a
+  metadata.gz: 8bd9f983ef31671217011a895e07b466f5327578f1dbc2288e5bcd08e367d038e0ee53c35ee1851323c8b04ab20e3fd27c1347a7615c869a99ebcebc8a949baf
+  data.tar.gz: cab52019893fb86e6fe66aaa9391d9d6cd721daac62550f7a0d2303bafbcc6deac349c4366315f8bc4ba15f6309b7ead3f30e3ff8fcd0e15a394c63c86071db7

data/.travis.yml

@@ -20,6 +20,9 @@ matrix:
     - name: 2.6.5 / Parser tests
       rvm: 2.6.5
       script: bundle exec rake test_cov
+    - name: 2.7.0 / Parser tests
+      rvm: 2.7.0
+      script: bundle exec rake test_cov
     - name: ruby-head / Parser tests
       rvm: ruby-head
       script: bundle exec rake test_cov
@@ -35,6 +38,9 @@ matrix:
     - name: 2.6.5 / Rubocop tests
       rvm: 2.6.5
       script: ./ci/run_rubocop_specs
+    - name: 2.7.0 / Rubocop tests
+      rvm: 2.7.0
+      script: ./ci/run_rubocop_specs
   allow_failures:
     - rvm: ruby-head
     - rvm: rbx-2

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 Changelog
 =========
 
-Not released (2019-12-30)
+Not released (2020-01-08)
 -------------------------
 
+Bugs fixed:
+ * lexer.rl: fix paren_nest for curly braces (#646) (Ilya Bylich)
+
+v2.7.0.1 (2019-12-30)
+---------------------
+
 Bugs fixed:
  * dedenter.rb: prevent `ArgumentError` when processing binary en… (#642) (Koichi ITO)
 

data/lib/parser/lexer.rl

@@ -1064,7 +1064,6 @@ class Parser::Lexer
           emit(:tRCURLY, '}'.freeze, p - 1, p)
           @cond.lexpop
           @cmdarg.lexpop
-          @paren_nest -= 1
         else
           emit(:tSTRING_DEND, '}'.freeze, p - 1, p)
         end
@@ -1079,6 +1078,8 @@ class Parser::Lexer
         fbreak;
       end
     end
+
+    @paren_nest -= 1
   };
 
   action extend_interp_code {
@@ -2165,6 +2166,9 @@ class Parser::Lexer
             emit_do
           end
         end
+        if tok == '{'.freeze
+          @paren_nest += 1
+        end
         @command_start = true
 
         fnext expr_value; fbreak;

data/lib/parser/version.rb

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

data/test/parse_helper.rb

@@ -127,6 +127,9 @@ module ParseHelper
 
     assert parser.instance_eval { @lexer }.cmdarg.empty?,
       "(#{version}) expected cmdarg to be empty after parsing"
+
+    assert_equal 0, parser.instance_eval { @lexer.instance_eval { @paren_nest } },
+      "(#{version}) expected paren_nest to be 0 after parsing"
   end
 
   # Use like this:

data/test/test_parser.rb

@@ -9294,4 +9294,16 @@ class TestParser < Minitest::Test
       %{     ^^ location},
       SINCE_2_7)
   end
+
+  def test_parser_bug_645
+    assert_parses(
+      s(:block,
+        s(:lambda),
+        s(:args,
+          s(:optarg, :arg,
+            s(:hash))), nil),
+      '-> (arg={}) {}',
+      %{},
+      SINCE_1_9)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.7.0.1
+  version: 2.7.0.2
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.