parser 2.7.0.5 → 2.7.1.4

data/test/test_meta.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'helper'
+
+class TestMeta < Minitest::Test
+  def test_NODE_TYPES
+    for_each_node do |node|
+      assert Parser::Meta::NODE_TYPES.include?(node.type),
+            "Type #{node.type} missing from Parser::Meta::NODE_TYPES"
+    end
+  end
+end

data/test/test_parser.rb

@@ -29,6 +29,7 @@ class TestParser < Minitest::Test
   SINCE_2_5 = SINCE_2_4 - %w(2.4)
   SINCE_2_6 = SINCE_2_5 - %w(2.5)
   SINCE_2_7 = SINCE_2_6 - %w(2.6)
+  SINCE_2_8 = SINCE_2_7 - %w(2.7)
 
   # Guidelines for test naming:
   #  * Test structure follows structure of AST_FORMAT.md.
@@ -5359,8 +5360,7 @@ class TestParser < Minitest::Test
 
   def test_crlf_line_endings
     with_versions(ALL_VERSIONS) do |_ver, parser|
-      source_file = Parser::Source::Buffer.new('(comments)')
-      source_file.source = "\r\nfoo"
+      source_file = Parser::Source::Buffer.new('(comments)', source: "\r\nfoo")
 
       range = lambda do |from, to|
         Parser::Source::Range.new(source_file, from, to)
@@ -5433,8 +5433,7 @@ class TestParser < Minitest::Test
     with_versions(ALL_VERSIONS) do |_ver, parser|
       parser.builder.emit_file_line_as_literals = false
 
-      source_file = Parser::Source::Buffer.new('(comments)')
-      source_file.source = "[__FILE__, __LINE__]"
+      source_file = Parser::Source::Buffer.new('(comments)', source: "[__FILE__, __LINE__]")
 
       ast = parser.parse(source_file)
 
@@ -5518,8 +5517,7 @@ class TestParser < Minitest::Test
 
   def assert_parses_with_comments(ast_pattern, source, comments_pattern)
     with_versions(ALL_VERSIONS) do |_ver, parser|
-      source_file = Parser::Source::Buffer.new('(comments)')
-      source_file.source = source
+      source_file = Parser::Source::Buffer.new('(comments)', source: source)
 
       comments_pattern_here = comments_pattern.map do |(from, to)|
         range = Parser::Source::Range.new(source_file, from, to)
@@ -5550,8 +5548,8 @@ class TestParser < Minitest::Test
 
   def test_tokenize
     with_versions(ALL_VERSIONS) do |_ver, parser|
-      source_file = Parser::Source::Buffer.new('(tokenize)')
-      source_file.source = "1 + # foo\n 2"
+      source_file = Parser::Source::Buffer.new('(tokenize)',
+        source: "1 + # foo\n 2")
 
       range = lambda do |from, to|
         Parser::Source::Range.new(source_file, from, to)
@@ -5577,8 +5575,8 @@ class TestParser < Minitest::Test
 
   def test_tokenize_recover
     with_versions(ALL_VERSIONS) do |_ver, parser|
-      source_file = Parser::Source::Buffer.new('(tokenize)')
-      source_file.source = "1 + # foo\n "
+      source_file = Parser::Source::Buffer.new('(tokenize)',
+        source: "1 + # foo\n ")
 
       range = lambda do |from, to|
         Parser::Source::Range.new(source_file, from, to)
@@ -6553,39 +6551,64 @@ class TestParser < Minitest::Test
 
   def test_context_class
     [
-      %q{class A;},
-      %q{class A < B;}
+      %q{class A; get_context; end},
+      %q{class A < B; get_context; end}
     ].each do |code|
       assert_context([:class], code, ALL_VERSIONS)
     end
   end
 
+  def test_context_module
+    assert_context(
+      [:module],
+      %q{module M; get_context; end},
+      ALL_VERSIONS)
+  end
+
   def test_context_sclass
     assert_context(
       [:sclass],
-      %q{class << foo;},
+      %q{class << foo; get_context; end},
       ALL_VERSIONS)
   end
 
   def test_context_def
-    assert_context(
-      [:def],
-      %q{def m;},
-      ALL_VERSIONS)
+    [
+      %q{def m; get_context; end},
+      %q{def m(a = get_context); end}
+    ].each do |code|
+      assert_context([:def], code, ALL_VERSIONS)
+    end
+
+    [
+      %q{def m() = get_context},
+      %q{def m(a = get_context) = 42}
+    ].each do |code|
+      assert_context([:def], code, SINCE_2_8)
+    end
   end
 
   def test_context_defs
-    assert_context(
-      [:defs],
-      %q{def foo.m;},
-      ALL_VERSIONS)
+    [
+      %q{def foo.m; get_context; end},
+      %q{def foo.m(a = get_context); end}
+    ].each do |code|
+      assert_context([:defs], code, ALL_VERSIONS)
+    end
+
+    [
+      %q{def foo.m() = get_context},
+      %q{def foo.m(a = get_context) = 42}
+    ].each do |code|
+      assert_context([:defs], code, SINCE_2_8)
+    end
   end
 
   def test_context_cmd_brace_block
     [
-      'tap foo {',
-      'foo.tap foo {',
-      'foo::tap foo {'
+      'tap foo { get_context }',
+      'foo.tap foo { get_context }',
+      'foo::tap foo { get_context }'
     ].each do |code|
       assert_context([:block], code, ALL_VERSIONS)
     end
@@ -6593,12 +6616,12 @@ class TestParser < Minitest::Test
 
   def test_context_brace_block
     [
-      'tap {',
-      'foo.tap {',
-      'foo::tap {',
-      'tap do',
-      'foo.tap do',
-      'foo::tap do'
+      'tap { get_context }',
+      'foo.tap { get_context }',
+      'foo::tap { get_context }',
+      'tap do get_context end',
+      'foo.tap do get_context end',
+      'foo::tap do get_context end'
     ].each do |code|
       assert_context([:block], code, ALL_VERSIONS)
     end
@@ -6606,9 +6629,9 @@ class TestParser < Minitest::Test
 
   def test_context_do_block
     [
-      %q{tap 1 do},
-      %q{foo.tap do},
-      %q{foo::tap do}
+      %q{tap 1 do get_context end},
+      %q{foo.tap do get_context end},
+      %q{foo::tap do get_context end}
     ].each do |code|
       assert_context([:block], code, ALL_VERSIONS)
     end
@@ -6616,8 +6639,12 @@ class TestParser < Minitest::Test
 
   def test_context_lambda
     [
-      '->() {',
-      '->() do'
+      '->() { get_context }',
+      '->() do get_context end',
+      '-> { get_context }',
+      '-> do get_context end',
+      '->(a = get_context) {}',
+      '->(a = get_context) do end'
     ].each do |code|
       assert_context([:lambda], code, SINCE_1_9)
     end
@@ -6625,28 +6652,61 @@ class TestParser < Minitest::Test
 
   def test_context_nested
     assert_context(
-      [:class, :sclass, :defs, :def, :block],
-      %q{class A; class << foo; def bar.m; def m; tap do},
+      [:class, :module, :sclass, :defs, :def, :block],
+      %q{
+        class A
+          module M
+            class << foo
+              def bar.m
+                def m
+                  tap do
+                    get_context
+                  end
+                end
+              end
+            end
+          end
+        end
+      },
       ALL_VERSIONS)
 
     assert_context(
-      [:class, :sclass, :defs, :def, :lambda, :block],
-      %q{class A; class << foo; def bar.m; def m; -> do; tap do},
+      [:class, :module, :sclass, :defs, :def, :lambda, :block],
+      %q{
+        class A
+          module M
+            class << foo
+              def bar.m
+                def m
+                  -> do
+                    tap do
+                      get_context
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      },
       SINCE_1_9)
 
     assert_context(
       [],
       %q{
         class A
-          class << foo
-            def bar.m
-              def m
-                tap do
+          module M
+            class << foo
+              def bar.m
+                def m
+                  tap do
+                  end
                 end
               end
             end
           end
         end
+        get_context
       },
       ALL_VERSIONS)
 
@@ -6654,17 +6714,20 @@ class TestParser < Minitest::Test
       [],
       %q{
         class A
-          class << foo
-            def bar.m
-              def m
-                -> do
-                  tap do
+          module M
+            class << foo
+              def bar.m
+                def m
+                  -> do
+                    tap do
+                    end
                   end
                 end
               end
             end
           end
         end
+        get_context
       },
       SINCE_1_9)
   end
@@ -7748,7 +7811,8 @@ class TestParser < Minitest::Test
     end
   end
 
-  def test_forward_args
+  def test_forward_args_legacy
+    Parser::Builders::Default.emit_forward_arg = false
     assert_parses(
       s(:def, :foo,
         s(:forward_args),
@@ -7780,7 +7844,27 @@ class TestParser < Minitest::Test
       %q{def foo(...); end},
       %q{},
       SINCE_2_7)
+  ensure
+    Parser::Builders::Default.emit_forward_arg = true
+  end
+
+  def test_forward_arg
+    assert_parses(
+      s(:def, :foo,
+        s(:args,
+          s(:forward_arg)),
+        s(:send, nil, :bar,
+          s(:forwarded_args))),
+      %q{def foo(...); bar(...); end},
+      %q{       ~ begin (args)
+        |       ~~~~~ expression (args)
+        |           ~ end (args)
+        |        ~~~ expression (args.forward_arg)
+        |                  ~~~ expression (send.forwarded_args)},
+      SINCE_2_7)
+  end
 
+  def test_forward_args_invalid
     assert_diagnoses(
       [:error, :block_and_blockarg],
       %q{def foo(...) bar(...) { }; end},
@@ -7806,6 +7890,12 @@ class TestParser < Minitest::Test
       %q{                    ^^^ location},
       SINCE_2_7)
 
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tBDOT3' }],
+      %q{def foo(x,y,z); bar(x, y, z, ...); end},
+      %q{                             ^^^ location},
+      SINCE_2_8)
+
     assert_diagnoses(
       [:error, :unexpected_token, { :token => 'tBDOT3' }],
       %q{def foo(x,y,z); super(...); end},
@@ -7822,7 +7912,13 @@ class TestParser < Minitest::Test
       [:error, :unexpected_token, { :token => 'tBDOT3' }],
       %q{->(...) {}},
       %q{   ^^^ location},
-      SINCE_2_7)
+      ['2.7'])
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tDOT3' }],
+      %q{->(...) {}},
+      %q{   ^^^ location},
+      SINCE_2_8)
 
     # Here and below the parser asssumes that
     # it can be a beginningless range, so the error comes after reducing right paren
@@ -7875,6 +7971,26 @@ class TestParser < Minitest::Test
       SINCE_2_7)
   end
 
+  def test_trailing_forward_arg
+    assert_parses(
+      s(:def, :foo,
+        s(:args,
+          s(:arg, :a),
+          s(:arg, :b),
+          s(:forward_arg)),
+        s(:send, nil, :bar,
+          s(:lvar, :a),
+          s(:int, 42),
+          s(:forwarded_args))),
+      %q{def foo(a, b, ...); bar(a, 42, ...); end},
+      %q{       ~ begin (args)
+        |       ~~~~~~~~~~~ expression (args)
+        |                 ~ end (args)
+        |              ~~~ expression (args.forward_arg)},
+      SINCE_2_8)
+  end
+
+
   def test_erange_without_parentheses_at_eol
     assert_diagnoses(
       [:warning, :triple_dot_at_eol],
@@ -8344,7 +8460,7 @@ class TestParser < Minitest::Test
         nil),
       "#{case_pre}#{code}; end",
       source_maps,
-      SINCE_2_7
+      versions
     )
   end
 
@@ -8675,6 +8791,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 +8874,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
@@ -8860,6 +9049,22 @@ class TestParser < Minitest::Test
       %q{           ~~~~~~~ location},
       SINCE_2_7
     )
+
+    assert_diagnoses(
+      [:error, :pm_interp_in_var_name],
+      %q{case a; in "#{a}": 1; end},
+      %q{           ~~~~~~~ location},
+      SINCE_2_7
+    )
+  end
+
+  def test_pattern_matching_invalid_lvar_name
+    assert_diagnoses(
+      [:error, :lvar_name, { name: :a? }],
+      %q{case a; in a?:; end},
+      %q{           ~~ location},
+      SINCE_2_7
+    )
   end
 
   def test_pattern_matching_keyword_variable
@@ -9137,8 +9342,7 @@ class TestParser < Minitest::Test
     code = "case 1; #{match_code}; then [#{lvar_names.join(', ')}]; end"
 
     with_versions(versions) do |version, parser|
-      source_file = Parser::Source::Buffer.new('(assert_context)')
-      source_file.source = code
+      source_file = Parser::Source::Buffer.new('(assert_context)', source: code)
 
       lvar_names.each do |lvar_name|
         refute parser.static_env.declared?(lvar_name),
@@ -9148,7 +9352,7 @@ class TestParser < Minitest::Test
       before = parser.static_env.instance_variable_get(:@variables).to_a
 
       begin
-        parsed_ast = parser.parse(source_file)
+        _parsed_ast = parser.parse(source_file)
       rescue Parser::SyntaxError => exc
         backtrace = exc.backtrace
         Exception.instance_method(:initialize).bind(exc).
@@ -9354,4 +9558,223 @@ class TestParser < Minitest::Test
       %{},
       SINCE_1_9)
   end
+
+  def test_endless_method
+    assert_parses(
+      s(:def_e, :foo,
+        s(:args),
+        s(:int, 42)),
+      %q{def foo() = 42},
+      %q{~~~ keyword
+        |    ~~~ name
+        |          ^ assignment
+        |~~~~~~~~~~~~~~ expression},
+      SINCE_2_8)
+
+    assert_parses(
+      s(:def_e, :inc,
+        s(:args, s(:arg, :x)),
+        s(:send,
+          s(:lvar, :x), :+,
+          s(:int, 1))),
+      %q{def inc(x) = x + 1},
+      %q{~~~ keyword
+        |    ~~~ name
+        |           ^ assignment
+        |~~~~~~~~~~~~~~~~~~ expression},
+      SINCE_2_8)
+
+    assert_parses(
+      s(:defs_e, s(:send, nil, :obj), :foo,
+        s(:args),
+        s(:int, 42)),
+      %q{def obj.foo() = 42},
+      %q{~~~ keyword
+        |       ^ operator
+        |        ~~~ name
+        |              ^ assignment
+        |~~~~~~~~~~~~~~~~~~ expression},
+      SINCE_2_8)
+
+    assert_parses(
+      s(:defs_e, s(:send, nil, :obj), :inc,
+        s(:args, s(:arg, :x)),
+        s(:send,
+          s(:lvar, :x), :+,
+          s(:int, 1))),
+      %q{def obj.inc(x) = x + 1},
+      %q{~~~ keyword
+        |        ~~~ name
+        |       ^ operator
+        |               ^ assignment
+        |~~~~~~~~~~~~~~~~~~~~~~ expression},
+      SINCE_2_8)
+  end
+
+  def test_endless_method_forwarded_args_legacy
+    Parser::Builders::Default.emit_forward_arg = false
+    assert_parses(
+      s(:def_e, :foo,
+        s(:forward_args),
+        s(:send, nil, :bar,
+          s(:forwarded_args))),
+      %q{def foo(...) = bar(...)},
+      %q{~~~ keyword
+        |    ~~~ name
+        |             ^ assignment
+        |~~~~~~~~~~~~~~~~~~~~~~~ expression},
+      SINCE_2_8)
+    Parser::Builders::Default.emit_forward_arg = true
+  end
+
+  def test_endless_method_without_brackets
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tEQL' }],
+      %Q{def foo = 42},
+      %q{        ^ location},
+      SINCE_2_8)
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tEQL' }],
+      %Q{def obj.foo = 42},
+      %q{            ^ location},
+      SINCE_2_8
+    )
+  end
+
+  def test_endless_method_with_rescue_mod
+    assert_parses(
+      s(:def_e, :m,
+        s(:args),
+        s(:rescue,
+          s(:int, 1),
+          s(:resbody, nil, nil,
+            s(:int, 2)), nil)),
+      %q{def m() = 1 rescue 2},
+      %q{},
+      SINCE_2_8)
+
+    assert_parses(
+      s(:defs_e,
+        s(:self), :m,
+        s(:args),
+        s(:rescue,
+          s(:int, 1),
+          s(:resbody, nil, nil,
+            s(:int, 2)), nil)),
+      %q{def self.m() = 1 rescue 2},
+      %q{},
+      SINCE_2_8)
+  end
+
+  def test_rasgn
+    assert_parses(
+      s(:rasgn,
+        s(:int, 1), s(:lvasgn, :a)),
+      %q{1 => a},
+      %q{~~~~~~ expression
+        |  ^^ operator},
+      SINCE_2_8)
+
+    assert_parses(
+      s(:rasgn,
+        s(:send, s(:int, 1), :+, s(:int, 2)),
+        s(:gvasgn, :$a)),
+      %q{1 + 2 => $a},
+      %q{~~~~~~~~~~~ expression
+        |      ^^ operator},
+      SINCE_2_8)
+  end
+
+  def test_mrasgn
+    assert_parses(
+      s(:mrasgn,
+        s(:send, s(:int, 13), :divmod, s(:int, 5)),
+        s(:mlhs, s(:lvasgn, :a), s(:lvasgn, :b))),
+      %q{13.divmod(5) => a,b},
+      %q{~~~~~~~~~~~~~~~~~~~ expression
+        |             ^^ operator},
+      SINCE_2_8)
+
+    assert_parses(
+      s(:mrasgn,
+        s(:mrasgn,
+          s(:send, s(:int, 13), :divmod, s(:int, 5)),
+          s(:mlhs, s(:lvasgn, :a), s(:lvasgn, :b))),
+        s(:mlhs, s(:lvasgn, :c), s(:lvasgn, :d))),
+      %q{13.divmod(5) => a,b => c, d},
+      %q{~~~~~~~~~~~~~~~~~~~ expression (mrasgn)
+        |~~~~~~~~~~~~~~~~~~~~~~~~~~~ expression},
+      SINCE_2_8)
+  end
+
+  def test_rasgn_line_continuation
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tASSOC' }],
+      %Q{13.divmod(5)\n=> a,b; [a, b]},
+      %{             ^^ location},
+      SINCE_2_8)
+  end
+
+  def test_find_pattern
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:find_pattern,
+          s(:match_rest,
+            s(:match_var, :x)),
+          s(:match_as,
+            s(:int, 1),
+            s(:match_var, :a)),
+          s(:match_rest,
+            s(:match_var, :y))),
+        nil,
+        s(:true)),
+      %q{in [*x, 1 => a, *y] then true},
+      %q{   ~~~~~~~~~~~~~~~~ expression (in_pattern.find_pattern)
+        |   ~ begin (in_pattern.find_pattern)
+        |                  ~ end (in_pattern.find_pattern)
+        |    ~~ expression (in_pattern.find_pattern.match_rest/1)
+        |                ~~ expression (in_pattern.find_pattern.match_rest/2)},
+      SINCE_2_8)
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:const_pattern,
+          s(:const, nil, :String),
+          s(:find_pattern,
+            s(:match_rest),
+            s(:int, 1),
+            s(:match_rest))),
+        nil,
+        s(:true)),
+      %q{in String(*, 1, *) then true},
+      %q{          ~~~~~~~ expression (in_pattern.const_pattern.find_pattern)},
+      SINCE_2_8)
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:const_pattern,
+          s(:const, nil, :Array),
+          s(:find_pattern,
+            s(:match_rest),
+            s(:int, 1),
+            s(:match_rest))),
+        nil,
+        s(:true)),
+      %q{in Array[*, 1, *] then true},
+      %q{         ~~~~~~~ expression (in_pattern.const_pattern.find_pattern)},
+      SINCE_2_8)
+
+    assert_parses_pattern_match(
+      s(:in_pattern,
+        s(:find_pattern,
+          s(:match_rest),
+          s(:int, 42),
+          s(:match_rest)),
+        nil,
+        s(:true)),
+      %q{in *, 42, * then true},
+      %q{   ~~~~~~~~ expression (in_pattern.find_pattern)},
+      SINCE_2_8)
+  end
 end