parser 2.7.0.5 → 2.7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a9bc5b2d70892e4743417168e53dc469c80328c3983e71b41f312becd116b0
-  data.tar.gz: 1abbc88751dc8d3b7c28d2df69b71a773533ed2d3726de50df8cfaaa79887aaa
+  metadata.gz: 46184af7a1e0d843e62e720cd7795bb196972603e588eed69f47791b3c799288
+  data.tar.gz: 1a9d809fc7443fb09deb3a36ea19ad418ff56119040b14a292c9ed8d112d1f29
 SHA512:
-  metadata.gz: 32455424b4003ba1510d53b162aa8691bdaea5708b4d88d392d6c89cfa3b6479f1d47c9f42fedd40e663366192434aaf851dbe65cbd1a629c54b7681cfb37879
-  data.tar.gz: 0c464e9acd5cf95161e18552e4680230417a05e7ad14e805b8661e4bb2ee7a99f4ad2f4e0212c48b35bc9f3ed8549b6723925f0b194e0a57873a2eb472450dbb
+  metadata.gz: 9a91995ac131a4048976358a7bce1bd09b09893bb0b13fa39f2128c47fb0b1179f830a4adbb766df768bfbd2f89a1c5a5ee437dc1433ccaf5ad2307ff7c09d77
+  data.tar.gz: 4fe835bc9fe1ff030d57e9a4d9a4657a0d244db23bac3c117e8f78bfc51d9dc330f51257e04c8ba5ef737d3feab11152db2e1ecde1e8b136d4fcc4f253ed549d

data/.travis.yml

@@ -2,26 +2,17 @@ dist: trusty
 language: ruby
 matrix:
   include:
-    - name: 2.0.0 / Parser tests
-      rvm: 2.0.0
-      script: bundle exec rake test_cov
-    - name: 2.2.10 / Parser tests
-      rvm: 2.2.10
-      script: bundle exec rake test_cov
-    - name: 2.3.8 / Parser tests
-      rvm: 2.3.8
-      script: bundle exec rake test_cov
     - name: 2.4.9 / Parser tests
       rvm: 2.4.9
       script: bundle exec rake test_cov
-    - name: 2.5.7 / Parser tests
-      rvm: 2.5.7
+    - name: 2.5.8 / Parser tests
+      rvm: 2.5.8
       script: bundle exec rake test_cov
-    - name: 2.6.5 / Parser tests
-      rvm: 2.6.5
+    - name: 2.6.6 / Parser tests
+      rvm: 2.6.6
       script: bundle exec rake test_cov
-    - name: 2.7.0 / Parser tests
-      rvm: 2.7.0
+    - name: 2.7.1 / Parser tests
+      rvm: 2.7.1
       script: bundle exec rake test_cov
     - name: ruby-head / Parser tests
       rvm: ruby-head
@@ -32,14 +23,14 @@ matrix:
     - name: rbx-2 / Parser tests
       rvm: rbx-2
       script: bundle exec rake test_cov
-    - name: 2.5.7 / Rubocop tests
-      rvm: 2.5.7
+    - name: 2.5.8 / Rubocop tests
+      rvm: 2.5.8
       script: ./ci/run_rubocop_specs
-    - name: 2.6.5 / Rubocop tests
-      rvm: 2.6.5
+    - name: 2.6.6 / Rubocop tests
+      rvm: 2.6.6
       script: ./ci/run_rubocop_specs
-    - name: 2.7.0 / Rubocop tests
-      rvm: 2.7.0
+    - name: 2.7.1 / Rubocop tests
+      rvm: 2.7.1
       script: ./ci/run_rubocop_specs
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,9 +1,19 @@
 Changelog
 =========
 
-Not released (2020-03-20)
+Not released (2020-04-03)
 -------------------------
 
+API modifications:
+ * Bump ruby versions to 2.4.10, 2.5.8, 2.6.6, 2.7.1. (#665) (Ilya Bylich)
+
+Features implemented:
+ * ruby27.y: allow newlines inside braced pattern. (#664) (Ilya Bylich)
+ * ruby27.y: Allow trailing comma in hash pattern (#661) (Koichi ITO)
+
+v2.7.0.5 (2020-03-20)
+---------------------
+
 Features implemented:
  * ruby27.y: fix array pattern with tail source map (#659) (Vladimir Dementyev)
 

data/lib/parser/current.rb

@@ -48,7 +48,7 @@ module Parser
     CurrentRuby = Ruby23
 
   when /^2\.4\./
-    current_version = '2.4.9'
+    current_version = '2.4.10'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby24', current_version
     end
@@ -57,7 +57,7 @@ module Parser
     CurrentRuby = Ruby24
 
   when /^2\.5\./
-    current_version = '2.5.7'
+    current_version = '2.5.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby25', current_version
     end
@@ -66,7 +66,7 @@ module Parser
     CurrentRuby = Ruby25
 
   when /^2\.6\./
-    current_version = '2.6.5'
+    current_version = '2.6.6'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby26', current_version
     end
@@ -75,7 +75,7 @@ module Parser
     CurrentRuby = Ruby26
 
   when /^2\.7\./
-    current_version = '2.7.0'
+    current_version = '2.7.1'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby27', current_version
     end

data/lib/parser/ruby27.y

@@ -1877,13 +1877,16 @@ opt_block_args_tail:
                 | tLBRACE
                     {
                       @pattern_hash_keys.push
+                      result = @lexer.in_kwarg
+                      @lexer.in_kwarg = false
                     }
-                  p_kwargs tRCURLY
+                  p_kwargs rbrace
                     {
                       @pattern_hash_keys.pop
+                      @lexer.in_kwarg = val[1]
                       result = @builder.hash_pattern(val[0], val[2], val[3])
                     }
-                | tLBRACE tRCURLY
+                | tLBRACE rbrace
                     {
                       result = @builder.hash_pattern(val[0], [], val[1])
                     }
@@ -1986,6 +1989,10 @@ opt_block_args_tail:
                     {
                       result = val[0]
                     }
+                | p_kwarg tCOMMA
+                    {
+                      result = val[0]
+                    }
                 | p_kwrest
                     {
                       result = val[0]
@@ -2898,6 +2905,10 @@ keyword_variable: kNIL
                     {
                       result = val[1]
                     }
+          rbrace: opt_nl tRCURLY
+                    {
+                      result = val[1]
+                    }
          trailer:  | tNL | tCOMMA
 
             term: tSEMI

data/lib/parser/version.rb

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

data/test/test_parser.rb

@@ -8675,6 +8675,18 @@ class TestParser < Minitest::Test
         |          ~ end (in_pattern.hash_pattern)}
     )
 
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:hash_pattern,
+          s(:pair, s(:sym, :a), s(:int, 1))),
+        nil,
+        s(:true)),
+      %q{in { a: 1, } then true},
+      %q{   ~~~~~~~~~ expression (in_pattern.hash_pattern)
+        |   ~ begin (in_pattern.hash_pattern)
+        |           ~ end (in_pattern.hash_pattern)}
+    )
+
     assert_parses_pattern_match(
       s(:in_pattern,
         s(:hash_pattern,
@@ -8746,6 +8758,67 @@ class TestParser < Minitest::Test
       %q{in a: 1, _a:, ** then true},
       %q{   ~~~~~~~~~~~~~ expression (in_pattern.hash_pattern)}
     )
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:hash_pattern,
+          s(:pair,
+            s(:sym, :a),
+            s(:int, 1))), nil,
+        s(:false)),
+      %q{
+        in {a: 1
+        }
+          false
+      },
+      %q{}
+    )
+
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:hash_pattern,
+          s(:pair,
+            s(:sym, :a),
+            s(:int, 2))), nil,
+        s(:false)),
+      %q{
+        in {a:
+              2}
+          false
+      },
+      %q{}
+    )
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:hash_pattern,
+          s(:pair,
+            s(:sym, :a),
+            s(:hash_pattern,
+              s(:match_var, :b))),
+          s(:match_var, :c)), nil,
+        s(:send, nil, :p,
+          s(:lvar, :c))),
+      %q{
+        in a: {b:}, c:
+          p c
+      },
+      %q{}
+    )
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:hash_pattern,
+          s(:match_var, :a)), nil,
+        s(:true)),
+      %q{
+        in {a:
+        }
+          true
+      },
+      %q{}
+    )
   end
 
   def test_pattern_matching_hash_with_string_keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.7.0.5
+  version: 2.7.1.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -297,9 +297,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v2.7.0.5/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/2.7.0.5
-  source_code_uri: https://github.com/whitequark/parser/tree/v2.7.0.5
+  changelog_uri: https://github.com/whitequark/parser/blob/v2.7.1.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/2.7.1.0
+  source_code_uri: https://github.com/whitequark/parser/tree/v2.7.1.0
 post_install_message: 
 rdoc_options: []
 require_paths: