parser 2.6.3.0 → 2.6.4.0

data/test/test_parser.rb

@@ -2457,7 +2457,7 @@ class TestParser < Minitest::Test
     # f_arg                                                      opt_f_block_arg
     # f_arg tCOMMA
     assert_parses_blockargs(
-      s(:args, s(:procarg0, :a)),
+      s(:args, s(:procarg0, s(:arg, :a))),
       %q{|a|},
       SINCE_1_9)
 
@@ -2700,6 +2700,39 @@ class TestParser < Minitest::Test
     Parser::Builders::Default.emit_procarg0 = true
   end
 
+  def test_emit_arg_inside_procarg0_legacy
+    Parser::Builders::Default.emit_arg_inside_procarg0 = false
+    assert_parses_blockargs(
+      s(:args,
+        s(:procarg0, :a)),
+      %q{|a|},
+      SINCE_1_9)
+  ensure
+    Parser::Builders::Default.emit_arg_inside_procarg0 = true
+  end
+
+  def test_procarg0
+    assert_parses(
+      s(:block,
+        s(:send, nil, :m),
+        s(:args,
+          s(:procarg0, s(:arg, :foo))), nil),
+      %q{m { |foo| } },
+      %q{     ^^^ expression (args.procarg0)},
+      SINCE_1_9)
+
+    assert_parses(
+      s(:block,
+        s(:send, nil, :m),
+        s(:args,
+          s(:procarg0, s(:arg, :foo), s(:arg, :bar))), nil),
+      %q{m { |(foo, bar)| } },
+      %q{     ^ begin (args.procarg0)
+        |              ^ end (args.procarg0)
+        |     ^^^^^^^^^^ expression (args.procarg0)},
+      SINCE_1_9)
+  end
+
   def test_block_kwarg_combinations
     # f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
     assert_parses_blockargs(
@@ -5116,6 +5149,26 @@ class TestParser < Minitest::Test
         |~~~~~~~~~~~~~~~~~~~~~ expression})
   end
 
+  def test_rescue_mod_masgn
+    assert_parses(
+      s(:masgn,
+        s(:mlhs,
+          s(:lvasgn, :foo),
+          s(:lvasgn, :bar)),
+        s(:rescue,
+          s(:send, nil, :meth),
+          s(:resbody, nil, nil,
+            s(:array,
+              s(:int, 1),
+              s(:int, 2))), nil)),
+      %q{foo, bar = meth rescue [1, 2]},
+      %q{                ~~~~~~ keyword (rescue.resbody)
+        |                ~~~~~~~~~~~~~ expression (rescue.resbody)
+        |           ~~~~~~~~~~~~~~~~~~ expression (rescue)
+        |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ expression},
+      SINCE_2_7)
+  end
+
   def test_rescue_mod_op_assign
     assert_parses(
       s(:op_asgn,
@@ -5675,7 +5728,7 @@ class TestParser < Minitest::Test
           s(:send,
             s(:int, 1), :tap),
           s(:args,
-            s(:procarg0, :n)),
+            s(:procarg0, s(:arg, :n))),
           s(:send, nil, :p,
             s(:lvar, :n))),
         s(:int, 0)),
@@ -6286,7 +6339,7 @@ class TestParser < Minitest::Test
         s(:send, nil, :a,
           s(:ivar, :@b)),
         s(:args,
-          s(:procarg0, :c)), nil),
+          s(:procarg0, s(:arg, :c))), nil),
       %q{a @b do |c|;end},
       %q{},
       SINCE_1_9)
@@ -7153,4 +7206,330 @@ class TestParser < Minitest::Test
       %q{    ^ location},
       SINCE_2_7)
   end
+
+  def test_unterimated_heredoc_id__27
+    assert_diagnoses(
+      [:error, :unterminated_heredoc_id],
+      %Q{<<\"EOS\n\nEOS\n},
+      %q{^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :unterminated_heredoc_id],
+      %Q{<<\"EOS\n\"\nEOS\n},
+      %q{^ location},
+      SINCE_2_7)
+
+    %W[\r\n \n].each do |nl|
+      assert_diagnoses(
+        [:error, :unterminated_heredoc_id],
+        %Q{<<\"\r\"#{nl}\r#{nl}},
+        %q{^ location},
+        SINCE_2_7)
+    end
+  end
+
+  def test_numbered_args_before_27
+    assert_diagnoses(
+      [:error, :ivar_name, { :name => '@1' }],
+      %q{m { @1 }},
+      %q{    ^^ location},
+      ALL_VERSIONS - SINCE_2_7
+    )
+  end
+
+  def test_numbered_args_after_27
+    assert_parses(
+      s(:numblock,
+        s(:send, nil, :m),
+        15,
+        s(:send,
+          s(:numparam, 1), :+,
+          s(:numparam, 15))),
+      %q{m { @1 + @15 }},
+      %q{^^^^^^^^^^^^^^ expression
+        |    ^^ name (send/2.numparam/1)
+        |    ^^ expression (send/2.numparam/1)
+        |         ^^^ name (send/2.numparam/2)
+        |         ^^^ expression (send/2.numparam/2)},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:numblock,
+        s(:send, nil, :m),
+        15,
+        s(:send,
+          s(:numparam, 1), :+,
+          s(:numparam, 15))),
+      %q{m do @1 + @15 end},
+      %q{^^^^^^^^^^^^^^^^^ expression
+        |     ^^ name (send/2.numparam/1)
+        |     ^^ expression (send/2.numparam/1)
+        |          ^^^ name (send/2.numparam/2)
+        |          ^^^ expression (send/2.numparam/2)},
+      SINCE_2_7)
+
+    # Lambdas
+
+    assert_parses(
+      s(:numblock,
+        s(:lambda),
+        15,
+        s(:send,
+          s(:numparam, 1), :+,
+          s(:numparam, 15))),
+      %q{-> { @1 + @15}},
+      %q{^^^^^^^^^^^^^^ expression
+        |     ^^ name (send.numparam/1)
+        |     ^^ expression (send.numparam/1)
+        |          ^^^ name (send.numparam/2)
+        |          ^^^ expression (send.numparam/2)},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:numblock,
+        s(:lambda),
+        15,
+        s(:send,
+          s(:numparam, 1), :+,
+          s(:numparam, 15))),
+      %q{-> do @1 + @15 end},
+      %q{^^^^^^^^^^^^^^^^^^ expression
+        |      ^^ name (send.numparam/1)
+        |      ^^ expression (send.numparam/1)
+        |           ^^^ name (send.numparam/2)
+        |           ^^^ expression (send.numparam/2)},
+      SINCE_2_7)
+  end
+
+  def test_numbered_and_ordinary_parameters
+    # Blocks
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{m { || @1 } },
+      %q{       ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{m { |a| @1 } },
+      %q{        ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{m do || @1 end },
+      %q{        ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{m do |a, b| @1 end },
+      %q{            ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{m { |x = @1| }},
+      %q{         ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{m { |x: @1| }},
+      %q{        ^^ location},
+      SINCE_2_7)
+
+    # Lambdas
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{->() { @1 } },
+      %q{       ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{->(a) { @1 } },
+      %q{        ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{->() do @1 end },
+      %q{        ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{->(a, b) do @1 end},
+      %q{            ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{->(x=@1) {}},
+      %q{     ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{->(x: @1) {}},
+      %q{      ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      %q{proc {|;a| @1}},
+      %q{           ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ordinary_param_defined],
+      "proc {|\n| @1}",
+      %q{          ^^ location},
+      SINCE_2_7)
+  end
+
+  def test_numparam_outside_block
+    assert_diagnoses(
+      [:error, :numparam_outside_block],
+      %q{class A; @1; end},
+      %q{         ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :numparam_outside_block],
+      %q{module A; @1; end},
+      %q{          ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :numparam_outside_block],
+      %q{class << foo; @1; end},
+      %q{              ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :numparam_outside_block],
+      %q{def self.m; @1; end},
+      %q{            ^^ location},
+      SINCE_2_7)
+  end
+
+  def test_ruby_bug_15789
+    assert_parses(
+      s(:send, nil, :m,
+        s(:block,
+          s(:lambda),
+          s(:args,
+            s(:optarg, :a,
+              s(:numblock,
+                s(:lambda), 1,
+                s(:numparam, 1)))),
+          s(:lvar, :a))),
+      %q{m ->(a = ->{@1}) {a}},
+      %q{},
+      SINCE_2_7)
+
+    assert_parses(
+      s(:send, nil, :m,
+        s(:block,
+          s(:lambda),
+          s(:args,
+            s(:kwoptarg, :a,
+              s(:numblock,
+                s(:lambda), 1,
+                s(:numparam, 1)))),
+          s(:lvar, :a))),
+      %q{m ->(a: ->{@1}) {a}},
+      %q{},
+      SINCE_2_7)
+  end
+
+  def test_ruby_bug_15839
+    assert_diagnoses(
+      [:error, :invalid_encoding],
+      %q{# encoding: cp932
+        <<-TEXT
+        \xe9\x9d\u1234
+        TEXT
+      })
+
+    assert_diagnoses(
+      [:error, :invalid_encoding],
+      %q{
+        # encoding: cp932
+        <<-TEXT
+        \xe9\x9d
+        \u1234
+        TEXT
+      })
+
+    assert_diagnoses(
+      [:error, :invalid_encoding],
+      %q{
+        # encoding: cp932
+        <<-TEXT
+        \u1234\xe9\x9d
+        TEXT
+      })
+
+    assert_diagnoses(
+      [:error, :invalid_encoding],
+      %q{
+        # encoding: cp932
+        <<-TEXT
+        \u1234
+        \xe9\x9d
+        TEXT
+      })
+  end
+
+  def test_numparam_as_symbols
+    assert_diagnoses(
+      [:error, :ivar_name, { :name => '@' }],
+      %q{:@},
+      %q{ ^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :ivar_name, { :name => '@1' }],
+      %q{:@1},
+      %q{ ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :cvar_name, { :name => '@@' }],
+      %q{:@@},
+      %q{ ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :cvar_name, { :name => '@@1' }],
+      %q{:@@1},
+      %q{ ^^^ location},
+      SINCE_2_7)
+  end
+
+  def test_csend_inside_lhs_of_masgn__since_27
+    assert_diagnoses(
+      [:error, :csend_in_lhs_of_masgn],
+      %q{*a&.x = 0},
+      %q{  ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :csend_in_lhs_of_masgn],
+      %q{a&.x, = 0},
+      %q{ ^^ location},
+      SINCE_2_7)
+
+    assert_diagnoses(
+      [:error, :csend_in_lhs_of_masgn],
+      %q{*a&.A = 0},
+      %q{  ^^ location},
+      SINCE_2_7)
+  end
 end

data/test/test_runner_parse.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'helper'
+require 'open3'
+
+class TestRunnerParse < Minitest::Test
+  PATH_TO_RUBY_PARSE = File.expand_path('../bin/ruby-parse', __dir__).freeze
+
+  def assert_prints(argv, expected_output)
+    stdout, stderr, status = Open3.capture3(PATH_TO_RUBY_PARSE, *argv)
+
+    assert_equal 0, status.to_i
+    assert_includes(stdout, expected_output)
+  end
+
+  def test_emit_ruby
+    assert_prints ['--emit-ruby', '-e 123'],
+                  's(:int, 123)'
+  end
+
+  def test_emit_json
+    assert_prints ['--emit-json', '-e', '123'],
+                  '["int",123]'
+  end
+
+  def test_emit_ruby_empty
+    assert_prints ['--emit-ruby', '-e', ''],
+                  "\n"
+  end
+
+  def test_emit_json_empty
+    assert_prints ['--emit-json', '-e', ''],
+                  "\n"
+  end
+end