parser 2.6.4.1 → 2.6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7b8b9f67b6aaacdb9a0d545465e924b4f648b111da6be699663c5c67c84e4f
-  data.tar.gz: 171070fa439abfe6279d7e0c713d46a28528669085cfc643ab808569d17357c1
+  metadata.gz: c12b17e36f142aa8aacc1aae95cd464ea9239cf526d973b7b1ed3f0825fc7698
+  data.tar.gz: 49948dbdc512a19d0b02d5edea2e12ff4eed8c89a2827728e5f0f9a618109b44
 SHA512:
-  metadata.gz: ab3de4f196504df68763d5efaa347b4febf2e2feed3dc1f0b407565a6f93434d4b1709dbe7a1fa36f28e39b25d67434ad861818ca7d570e0b2b0d8b5b1e71ff9
-  data.tar.gz: 8634d57721f51fa9dd91c843960fb6c20a7bbb0331c6e62b3f29da3a770f5471f9adcaad14efb5a68904f2e93767e835022abcb9b739c113898822942085f112
+  metadata.gz: 67bbf82221c9795d5a892f51ccb3c51835657448842a078bbcee88b8b1ef649643600d01d2c1c0b2e59982a774803a3a780538c433e8cc3a4fdfe8168838a697
+  data.tar.gz: 9d7053f65800e04f8f2c0b1f344d9f83efd1282744aba49c02b384ea4242a3bcc5b65b7ac3eca4c4d0c34317ed70393a1eb26e146b34517ad75810b9498eb0a7

data/.travis.yml

@@ -11,14 +11,14 @@ matrix:
     - name: 2.3.8 / Parser tests
       rvm: 2.3.8
       script: bundle exec rake test_cov
-    - name: 2.4.7 / Parser tests
-      rvm: 2.4.7
+    - name: 2.4.9 / Parser tests
+      rvm: 2.4.9
       script: bundle exec rake test_cov
-    - name: 2.5.6 / Parser tests
-      rvm: 2.5.6
+    - name: 2.5.7 / Parser tests
+      rvm: 2.5.7
       script: bundle exec rake test_cov
-    - name: 2.6.4 / Parser tests
-      rvm: 2.6.4
+    - name: 2.6.5 / Parser tests
+      rvm: 2.6.5
       script: bundle exec rake test_cov
     - name: ruby-head / Parser tests
       rvm: ruby-head
@@ -29,11 +29,11 @@ matrix:
     - name: rbx-2 / Parser tests
       rvm: rbx-2
       script: bundle exec rake test_cov
-    - name: 2.5.6 / Rubocop tests
-      rvm: 2.5.6
+    - name: 2.5.7 / Rubocop tests
+      rvm: 2.5.7
       script: ./ci/run_rubocop_specs
-    - name: 2.6.4 / Rubocop tests
-      rvm: 2.6.4
+    - name: 2.6.5 / Rubocop tests
+      rvm: 2.6.5
       script: ./ci/run_rubocop_specs
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,6 +1,94 @@
 Changelog
 =========
 
+v2.6.4.1 (2019-09-12)
+---------------------
+
+Bugs fixed:
+ * lexer.rl: fix parsing of 'm a + b do end' (#605) (Ilya Bylich)
+
+v2.6.4.0 (2019-08-30)
+---------------------
+
+API modifications:
+ * Added specs for heredocs with mixed encoding. (#581) (Ilya Bylich)
+
+Features implemented:
+ * ruby27.y: Revert "pipeline operator" (#601) (Koichi ITO)
+ * ruby27.y: Fix parsing of mutiple assignment with rescue modifier (#600) (Koichi ITO)
+ * ruby27.y: hoisted out f_rest_marg. (#594) (Ilya Bylich)
+ * ruby27.y: added pipeline operator. (#592) (Ilya Bylich)
+ * ruby27.y: reject safe navigator in LHS of mass-assignment. (#586) (Ilya Bylich)
+ * lexer.rl: reject whitespaces in meta and control chars. (#585) (Ilya Bylich)
+ * lexer.rl: Reject numparams as symbol literals. (#582) (Ilya Bylich)
+ * ruby27.y: Added numbered parameters support. (#565) (Ilya Bylich)
+ * lexer.rl: Reject \n and \r in heredoc identifiers starting from 2.7. (#575) (Ilya Bylich)
+
+Bugs fixed:
+ * ruby-parse: print empty string when --emit-json and empty input are given. (#590) (Ilya Bylich)
+ * AST_FORMAT: fixed documentation of the string with interpolation. (#589) (Ilya Bylich)
+ * builder.rb, processor.rb: Changed format of the procarg0 node. (#587) (Ilya Bylich)
+
+v2.6.3.0 (2019-04-28)
+---------------------
+
+Features implemented:
+ * ruby27.y: Added beginless ranges support. (#570) (Ilya Bylich)
+
+v2.6.2.1 (2019-04-05)
+---------------------
+
+API modifications:
+ * Bump 2.4 branch to 2.4.6. (#569) (Ilya Bylich)
+ * Lexer should know about current parsing context. (#566) (Ilya Bylich)
+
+v2.6.2.0 (2019-03-21)
+---------------------
+
+API modifications:
+ * Bump ruby versions to 2.5.5 and 2.6.2. (#563) (Ilya Bylich)
+ * Bump Ruby version to 2.6.1. (#554) (Ilya Bylich)
+
+Features implemented:
+ * ruby27.y: dsym should be treated as string. (#560) (Ilya Bylich)
+ * ruby27.y: Refactored symbol rules. (#557) (Ilya Bylich)
+ * ruby27.y: Added method reference operator. (#556) (Ilya Bylich)
+ * ruby27.y: branch parser. (#546) (Ilya Bylich)
+
+v2.6.0.0 (2019-01-16)
+---------------------
+
+API modifications:
+ * 2.6.0 was released, unmark is as -dev. (#538) (Ilya Bylich)
+
+Bugs fixed:
+ * Fix parsing of "\\\n" escaped sequences in various literals. (#539) (Ilya Bylich)
+
+v2.5.3.0 (2018-10-29)
+---------------------
+
+Bugs fixed:
+ * lexer.rl: Fix parsing of 'm :key => m do; m() do end; end'. (#526) (Ilya Bylich)
+ * lexer.rl: Fix parsing of ambiguous 1re. (#523) (Ilya Bylich)
+
+v2.5.1.2 (2018-07-10)
+---------------------
+
+Bugs fixed:
+ * lexer.rl: Partially revert 5ba072d and properly handle 'm = -> *args do end'. (Ilya Bylich)
+
+v2.5.1.1 (2018-07-10)
+---------------------
+
+Features implemented:
+ * ruby26.y: Endless ranges support. (Ilya Bylich)
+
+Bugs fixed:
+ * lexer.rl: Fix parsing of 'm = -> *args do end'. (Ilya Bylich)
+ * AST::Processor: Properly recurse into "kwsplat" nodes (Nelson Elhage)
+ * ruby24, ruby25, ruby26: Fix cmdargs after command_args followed by tLBRACE_ARG. This commit tracks upstream commit ruby/ruby@f168dbd. (Ilya Bylich)
+ * lexer.rl: Fix parsing of `let (:a) { m do; end }`. (Ilya Bylich)
+
 v2.5.1.0 (2018-04-12)
 ---------------------
 

data/lib/parser/current.rb

@@ -48,7 +48,7 @@ module Parser
     CurrentRuby = Ruby23
 
   when /^2\.4\./
-    current_version = '2.4.7'
+    current_version = '2.4.9'
     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.6'
+    current_version = '2.5.7'
     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.4'
+    current_version = '2.6.5'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby26', current_version
     end

data/lib/parser/lexer.rl

@@ -89,7 +89,7 @@ class Parser::Lexer
 
   REGEXP_META_CHARACTERS = Regexp.union(*"\\$()*+.<>?[]^{|}".chars).freeze
 
-  NUMPARAM_MAX = 100
+  NUMPARAM_MAX = 9
 
   attr_reader   :source_buffer
   attr_reader   :max_numparam_stack
@@ -2339,7 +2339,19 @@ class Parser::Lexer
            p = p - tok.length + 2
            fnext expr_dot; fbreak; };
 
-      '.:' | '.' | '&.' | '::'
+      '.:'
+      => {
+        if @version >= 27
+          emit_table(PUNCTUATION)
+        else
+          emit(:tDOT, tok(@ts, @ts + 1), @ts, @ts + 1)
+          fhold;
+        end
+
+        fnext expr_dot; fbreak;
+      };
+
+      '.' | '&.' | '::'
       => { emit_table(PUNCTUATION)
            fnext expr_dot; fbreak; };
 
@@ -2453,7 +2465,25 @@ class Parser::Lexer
   leading_dot := |*
       # Insane leading dots:
       # a #comment
+      #  # post-2.7 comment
       #  .b: a.b
+
+      # Here we use '\n' instead of w_newline to not modify @newline_s
+      # and eventually properly emit tNL
+      (w_space_comment '\n')+
+      => {
+        if @version < 27
+          # Ruby before 2.7 doesn't support comments before leading dot.
+          # If a line after "a" starts with a comment then "a" is a self-contained statement.
+          # So in that case we emit a special tNL token and start reading the
+          # next line as a separate statement.
+          #
+          # Note: block comments before leading dot are not supported on any version of Ruby.
+          emit(:tNL, nil, @newline_s, @newline_s + 1)
+          fhold; fnext line_begin; fbreak;
+        end
+      };
+
       c_space* %{ tm = p } ('.' | '&.')
       => { p = tm - 1; fgoto expr_end; };
 

data/lib/parser/macruby.y

@@ -81,7 +81,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby18.y

@@ -54,7 +54,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby19.y

@@ -81,7 +81,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby20.y

@@ -81,7 +81,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby21.y

@@ -82,7 +82,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby22.y

@@ -82,7 +82,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby23.y

@@ -82,7 +82,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby24.y

@@ -82,7 +82,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby25.y

@@ -87,7 +87,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby26.y

@@ -87,7 +87,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :error, :useless_else, nil, else_t
                       end
 

data/lib/parser/ruby27.y

@@ -87,7 +87,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :error, :useless_else, nil, else_t
                       end
 

data/lib/parser/rubymotion.y

@@ -53,7 +53,7 @@ rule
                       else_t,   else_   = val[2]
                       ensure_t, ensure_ = val[3]
 
-                      if rescue_bodies.empty? && !else_.nil?
+                      if rescue_bodies.empty? && !else_t.nil?
                         diagnostic :warning, :useless_else, nil, else_t
                       end
 

data/lib/parser/source/tree_rewriter.rb

@@ -266,7 +266,7 @@ module Parser
 
       def combine(range, attributes)
         range = check_range_validity(range)
-        action = TreeRewriter::Action.new(range, @enforcer, attributes)
+        action = TreeRewriter::Action.new(range, @enforcer, **attributes)
         @action_root = @action_root.combine(action)
         self
       end

data/lib/parser/version.rb

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

data/test/test_lexer.rb

@@ -477,14 +477,18 @@ class TestLexer < Minitest::Test
   end
 
   def test_comment
-    assert_scanned("1 # one\n# two\n2",
-                   :tINTEGER, 1,   [0, 1],
-                   :tNL,      nil, [7, 8],
-                   :tINTEGER, 2,   [14, 15])
+    [26, 27].each do |version|
+      setup_lexer(version)
+
+      assert_scanned("1 # one\n# two\n2",
+                     :tINTEGER, 1,   [0, 1],
+                     :tNL,      nil, [7, 8],
+                     :tINTEGER, 2,   [14, 15])
 
-    assert_equal 2, @lex.comments.length
-    assert_equal '# one', @lex.comments[0].text
-    assert_equal '# two', @lex.comments[1].text
+      assert_equal 2, @lex.comments.length
+      assert_equal '# one', @lex.comments[0].text
+      assert_equal '# two', @lex.comments[1].text
+    end
   end
 
   def test_comment_expr_beg
@@ -3559,6 +3563,8 @@ class TestLexer < Minitest::Test
   end
 
   def test_meth_ref
+    setup_lexer(27)
+
     assert_scanned('foo.:bar',
                   :tIDENTIFIER, 'foo', [0, 3],
                   :tMETHREF,   '.:',   [3, 5],
@@ -3571,6 +3577,8 @@ class TestLexer < Minitest::Test
   end
 
   def test_meth_ref_unary_op
+    setup_lexer(27)
+
     assert_scanned('foo.:+',
                   :tIDENTIFIER, 'foo', [0, 3],
                   :tMETHREF,    '.:',  [3, 5],
@@ -3646,11 +3654,11 @@ class TestLexer < Minitest::Test
     assert_equal(@lex.max_numparam, 1)
 
     setup_lexer(27)
-    assert_scanned_numbered_parameter('@100')
-    assert_equal(@lex.max_numparam, 100)
+    assert_scanned_numbered_parameter('@9')
+    assert_equal(@lex.max_numparam, 9)
 
     setup_lexer(27)
-    refute_scanned_numbered_parameter('@101', :too_large_numparam)
+    refute_scanned_numbered_parameter('@10', :too_large_numparam)
 
     setup_lexer(27)
     refute_scanned_numbered_parameter('@01', :leading_zero_in_numparam)

data/test/test_parser.rb

@@ -5094,6 +5094,12 @@ class TestParser < Minitest::Test
       %q{begin; 1; else; 2; end},
       %q{          ~~~~ location},
       SINCE_2_6)
+
+    assert_diagnoses(
+      [:error, :useless_else],
+      %q{begin; 1; else; end},
+      %q{          ~~~~ location},
+      SINCE_2_6)
   end
 
   def test_ensure
@@ -5668,7 +5674,9 @@ class TestParser < Minitest::Test
       s(:def, :foo, s(:args),
         s(:begin,
           s(:begin, nil))),
-      %q{def foo; else; end})
+      %q{def foo; else; end},
+      %q{},
+      ALL_VERSIONS - SINCE_2_6)
   end
 
   def test_bug_heredoc_do
@@ -7206,7 +7214,7 @@ class TestParser < Minitest::Test
     end
   end
 
-  def test_meth_ref
+  def test_meth_ref__27
     assert_parses(
       s(:meth_ref, s(:lvar, :foo), :bar),
       %q{foo.:bar},
@@ -7224,6 +7232,20 @@ class TestParser < Minitest::Test
       SINCE_2_7)
   end
 
+  def test_meth_ref__before_27
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tCOLON' }],
+      %q{foo.:bar},
+      %q{    ^ location },
+      ALL_VERSIONS - SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tCOLON' }],
+      %q{foo.:+@},
+      %q{    ^ location },
+      ALL_VERSIONS - SINCE_2_7)
+  end
+
   def test_meth_ref_unsupported_newlines
     assert_diagnoses(
       [:error, :unexpected_token, { :token => 'tCOLON' }],
@@ -7273,31 +7295,31 @@ class TestParser < Minitest::Test
     assert_parses(
       s(:numblock,
         s(:send, nil, :m),
-        15,
+        9,
         s(:send,
           s(:numparam, 1), :+,
-          s(:numparam, 15))),
-      %q{m { @1 + @15 }},
-      %q{^^^^^^^^^^^^^^ expression
+          s(:numparam, 9))),
+      %q{m { @1 + @9 }},
+      %q{^^^^^^^^^^^^^ expression
         |    ^^ name (send/2.numparam/1)
         |    ^^ expression (send/2.numparam/1)
-        |         ^^^ name (send/2.numparam/2)
-        |         ^^^ expression (send/2.numparam/2)},
+        |         ^^ name (send/2.numparam/2)
+        |         ^^ expression (send/2.numparam/2)},
       SINCE_2_7)
 
     assert_parses(
       s(:numblock,
         s(:send, nil, :m),
-        15,
+        9,
         s(:send,
           s(:numparam, 1), :+,
-          s(:numparam, 15))),
-      %q{m do @1 + @15 end},
-      %q{^^^^^^^^^^^^^^^^^ expression
+          s(:numparam, 9))),
+      %q{m do @1 + @9 end},
+      %q{^^^^^^^^^^^^^^^^ expression
         |     ^^ name (send/2.numparam/1)
         |     ^^ expression (send/2.numparam/1)
-        |          ^^^ name (send/2.numparam/2)
-        |          ^^^ expression (send/2.numparam/2)},
+        |          ^^ name (send/2.numparam/2)
+        |          ^^ expression (send/2.numparam/2)},
       SINCE_2_7)
 
     # Lambdas
@@ -7305,31 +7327,31 @@ class TestParser < Minitest::Test
     assert_parses(
       s(:numblock,
         s(:lambda),
-        15,
+        9,
         s(:send,
           s(:numparam, 1), :+,
-          s(:numparam, 15))),
-      %q{-> { @1 + @15}},
-      %q{^^^^^^^^^^^^^^ expression
+          s(:numparam, 9))),
+      %q{-> { @1 + @9}},
+      %q{^^^^^^^^^^^^^ expression
         |     ^^ name (send.numparam/1)
         |     ^^ expression (send.numparam/1)
-        |          ^^^ name (send.numparam/2)
-        |          ^^^ expression (send.numparam/2)},
+        |          ^^ name (send.numparam/2)
+        |          ^^ expression (send.numparam/2)},
       SINCE_2_7)
 
     assert_parses(
       s(:numblock,
         s(:lambda),
-        15,
+        9,
         s(:send,
           s(:numparam, 1), :+,
-          s(:numparam, 15))),
-      %q{-> do @1 + @15 end},
-      %q{^^^^^^^^^^^^^^^^^^ expression
+          s(:numparam, 9))),
+      %q{-> do @1 + @9 end},
+      %q{^^^^^^^^^^^^^^^^^ expression
         |      ^^ name (send.numparam/1)
         |      ^^ expression (send.numparam/1)
-        |           ^^^ name (send.numparam/2)
-        |           ^^^ expression (send.numparam/2)},
+        |           ^^ name (send.numparam/2)
+        |           ^^ expression (send.numparam/2)},
       SINCE_2_7)
   end
 
@@ -7576,4 +7598,47 @@ class TestParser < Minitest::Test
       %q{},
       ALL_VERSIONS)
   end
+
+  def test_comments_before_leading_dot__27
+    assert_parses(
+      s(:send,
+        s(:send, nil, :a), :foo),
+      %Q{a #\n#\n.foo\n},
+      %q{},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:csend,
+        s(:send, nil, :a), :foo),
+      %Q{a #\n#\n&.foo\n},
+      %q{},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:meth_ref,
+        s(:send, nil, :a), :foo),
+      %Q{a #\n#\n.:foo\n},
+      %q{},
+      SINCE_2_7)
+  end
+
+  def test_comments_before_leading_dot__before_27
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tDOT' }],
+      %q{a #!#!.foo!}.gsub('!', "\n"),
+      %q{      ^ location},
+      ALL_VERSIONS - SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tAMPER' }],
+      %q{a #!#!&.foo!}.gsub('!', "\n"),
+      %q{      ^ location},
+      ALL_VERSIONS - SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tDOT' }],
+      %q{a #!#!.:foo!}.gsub('!', "\n"),
+      %q{      ^ location},
+      ALL_VERSIONS - SINCE_2_7)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.6.4.1
+  version: 2.6.5.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.