ruby_parser 3.15.0 → 3.19.2

data/test/test_ruby_parser.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# ENV["VERBOSE"] = "1"
+ENV["VERBOSE"] = "1"
 
 require "minitest/autorun"
 require "ruby_parser"
@@ -34,12 +34,15 @@ module TestRubyParserShared
     skip "not ready for this yet"
 
     rb = "def f; if /(?<foo>bar)/ =~ 'bar' && p(foo); foo; end; end; f"
-    pt = s(:if,
-           s(:and,
-             s(:match2, s(:lit, /(?<foo>bar)/), s(:str, "bar")),
-             s(:call, nil, :p, s(:lvar, :foo))),
-           s(:lvar, :foo),
-           nil)
+    pt = s(:block,
+           s(:defn, :f, s(:args),
+             s(:if,
+               s(:and,
+                 s(:match2, s(:lit, /(?<foo>bar)/), s(:str, "bar")),
+                 s(:call, nil, :p, s(:lvar, :foo))),
+               s(:lvar, :foo),
+               nil)),
+           s(:call, nil, :f))
 
     assert_parse rb, pt
   end
@@ -86,10 +89,10 @@ module TestRubyParserShared
   def test_and_multi
     rb = "true and\nnot false and\ntrue"
     pt = s(:and,
-           s(:true).line(1),
+           s(:true),
            s(:and,
              s(:call, s(:false).line(2), :!).line(2),
-             s(:true).line(3)).line(2)).line(1)
+             s(:true).line(3)).line(2))
 
     assert_parse rb, pt
   end
@@ -117,7 +120,7 @@ module TestRubyParserShared
     pt = s(:block,
            s(:array,
              s(:str, "a").line(2),
-             s(:str, "b").line(3)).line(1),
+             s(:str, "b").line(3)),
            s(:lit, 1).line(4)).line 1
     assert_parse rb, pt
   end
@@ -167,7 +170,7 @@ module TestRubyParserShared
     pt = s(:call, nil, :x,
            s(:dxstr, "",
              s(:evstr,
-               s(:call, nil, :y).line(1)).line(1))).line(1)
+               s(:call, nil, :y))))
 
     assert_parse rb, pt
   end
@@ -179,10 +182,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
-  def test_begin_else_return_value
+  def test_begin_else_return_value # overridden below, warns < 2.6
     rb = "begin; else 2; end"
+    pt = s(:lit, 2)
 
-    assert_syntax_error rb, "else without rescue is useless"
+    assert_output "", "else without rescue is useless\n" do
+      assert_parse rb, pt
+    end
   end
 
   def test_begin_ensure_no_bodies
@@ -240,26 +246,26 @@ module TestRubyParserShared
     head = s(:args).line 1
     tail = s(:zsuper).line 2
     expected = s(:block,
-                 s(:args).line(1),
+                 s(:args),
                  s(:zsuper).line(2)).line 1
     assert_equal expected, processor.block_append(head, tail)
   end
 
   def test_block_append_begin_begin
-    head = s(:begin, s(:args).line(1)).line 1
+    head = s(:begin, s(:args)).line 1
     tail = s(:begin, s(:args).line(2)).line 2
     expected = s(:block,
-                 s(:args).line(1),
+                 s(:args),
                  s(:begin,
                    s(:args).line(2)).line(2)).line 1
     assert_equal expected, processor.block_append(head, tail)
   end
 
   def test_block_append_block
-    head = s(:block, s(:args).line(1)).line(1)
+    head = s(:block, s(:args))
     tail = s(:zsuper).line(2)
     expected = s(:block,
-                 s(:args).line(1),
+                 s(:args),
                  s(:zsuper).line(2)).line 1
     assert_equal expected, processor.block_append(head, tail)
   end
@@ -284,7 +290,7 @@ module TestRubyParserShared
              s(:undef, s(:lit, :x)).line(2),
              s(:undef, s(:lit, :y)).line(3)).line 2
     expected = s(:block,
-                 s(:call, nil, :f1).line(1),
+                 s(:call, nil, :f1),
                  s(:block,
                    s(:undef, s(:lit, :x)).line(2),
                    s(:undef, s(:lit, :y)).line(3)).line(2)).line 1
@@ -322,13 +328,14 @@ module TestRubyParserShared
   end
 
   def test_bug170
-    skip "not ready for this yet"
-
-    # TODO: needs to fail on 2.1 and up
     rb = '$-'
     pt = s(:gvar, :"$-")
 
-    assert_parse rb, pt
+    if processor.class.version >= 21
+      assert_syntax_error rb, /unexpected \$undefined/
+    else
+      assert_parse rb, pt
+    end
   end
 
   def test_bug179
@@ -339,12 +346,9 @@ module TestRubyParserShared
   end
 
   def test_bug190
-    skip "not ready for this yet"
-
     rb = %{%r'\\\''} # stupid emacs
 
-    assert_parse rb, :FUCK
-    assert_syntax_error rb, "FUCK"
+    assert_parse rb, s(:lit, %r%'%)
 
     rb = %{%r'\\''}
     pt = s(:lit, /'/)
@@ -366,7 +370,7 @@ module TestRubyParserShared
     rb = "$测试 = 1\n测试 = 1"
     pt = s(:block,
            s(:gasgn, :$测试, s(:lit, 1)),
-           s(:lasgn, :测试, s(:lit, 1)))
+           s(:lasgn, :测试, s(:lit, 1).line(2)).line(2))
 
     assert_parse rb, pt
   end
@@ -397,7 +401,7 @@ module TestRubyParserShared
     assert_parse rb, pt
 
     rb = "true and\ntrue"
-    pt = s(:and, s(:true), s(:true))
+    pt = s(:and, s(:true), s(:true).line(2))
 
     assert_parse rb, pt
   end
@@ -420,10 +424,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
-  def test_bug_begin_else
+  def test_bug_begin_else # overridden below, warns < 2.6
     rb = "begin 1; else; 2 end"
+    pt = s(:block, s(:lit, 1), s(:lit, 2))
 
-    assert_syntax_error rb, "else without rescue is useless"
+    assert_output "", "else without rescue is useless\n" do
+      assert_parse rb, pt
+    end
   end
 
   def test_bug_call_arglist_parens
@@ -439,7 +446,7 @@ module TestRubyParserShared
     CODE
 
     pt = s(:defn, :f, s(:args),
-           s(:call, nil, :g, s(:lit, 1), s(:lit, 2)))
+           s(:call, nil, :g, s(:lit, 1).line(2), s(:lit, 2).line(2)).line(2))
 
     assert_parse rb, pt
 
@@ -667,7 +674,7 @@ module TestRubyParserShared
   def test_class_comments
     rb = "# blah 1\n# blah 2\n\nclass X\n  # blah 3\n  def blah\n    # blah 4\n  end\nend"
     pt = s(:class, :X, nil,
-           s(:defn, :blah, s(:args), s(:nil)))
+           s(:defn, :blah, s(:args).line(6), s(:nil).line(6)).line(6)).line(4)
 
     assert_parse rb, pt
 
@@ -688,12 +695,13 @@ module TestRubyParserShared
            s(:call, nil, :a),
            0,
            s(:block,
-             s(:lasgn, :v, s(:nil)),
+             s(:lasgn, :v, s(:nil).line(2)).line(2),
              s(:rescue,
-               s(:yield),
+               s(:yield).line(4),
                s(:resbody,
-                 s(:array, s(:const, :Exception), s(:lasgn, :v, s(:gvar, :$!))),
-                 s(:break)))))
+                 s(:array, s(:const, :Exception).line(5),
+                   s(:lasgn, :v, s(:gvar, :$!).line(5)).line(5)).line(5),
+                 s(:break).line(6)).line(5)).line(4)).line(2))
 
     assert_parse rb, pt
   end
@@ -707,7 +715,7 @@ module TestRubyParserShared
 
   def test_defn_comments
     rb = "# blah 1\n# blah 2\n\ndef blah\nend"
-    pt = s(:defn, :blah, s(:args), s(:nil))
+    pt = s(:defn, :blah, s(:args).line(4), s(:nil).line(4)).line(4)
 
     assert_parse rb, pt
     assert_equal "# blah 1\n# blah 2\n\n", result.comments
@@ -733,7 +741,8 @@ module TestRubyParserShared
 
   def test_defs_comments
     rb = "# blah 1\n# blah 2\n\ndef self.blah\nend"
-    pt = s(:defs, s(:self), :blah, s(:args), s(:nil))
+    pt = s(:defs, s(:self).line(4), :blah, s(:args).line(4),
+           s(:nil).line(4)).line(4)
 
     assert_parse rb, pt
     assert_equal "# blah 1\n# blah 2\n\n", result.comments
@@ -744,8 +753,8 @@ module TestRubyParserShared
     pt = s(:block,
            s(:call, nil, :a, s(:lit, 1)),
            s(:iter,
-             s(:call, s(:call, nil, :a), :b),
-             s(:args, :c)))
+             s(:call, s(:call, nil, :a).line(2), :b).line(2),
+             s(:args, :c).line(2)).line(2))
 
     assert_parse rb, pt
   end
@@ -817,6 +826,13 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_dsym_esc_to_sym
+    rb = ':"Variet\303\240"'
+    pt = s(:lit, :Varietà)
+
+    assert_parse rb, pt
+  end
+
   def test_empty
     refute_parse ""
   end
@@ -824,7 +840,7 @@ module TestRubyParserShared
   def test_eq_begin_line_numbers
     rb = "1\n=begin\ncomment\ncomment\n=end\n2"
     pt = s(:block,
-           s(:lit, 1).line(1),
+           s(:lit, 1),
            s(:lit, 2).line(6))
 
     assert_parse rb, pt
@@ -832,7 +848,9 @@ module TestRubyParserShared
 
   def test_eq_begin_why_wont_people_use_their_spacebar?
     rb = "h[k]=begin\n       42\n     end"
-    pt = s(:attrasgn, s(:call, nil, :h), :[]=, s(:call, nil, :k), s(:lit, 42))
+    pt = s(:attrasgn,
+           s(:call, nil, :h), :[]=, s(:call, nil, :k),
+           s(:lit, 42).line(2))
 
     assert_parse rb, pt
   end
@@ -881,6 +899,29 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_heredoc_lineno
+    rb = "c = <<'CCC'\nline2\nline3\nline4\nCCC\n\nd = 42"
+    pt = s(:block,
+           s(:lasgn, :c, s(:str, "line2\nline3\nline4\n")),
+           s(:lasgn, :d, s(:lit, 42).line(7)).line(7))
+
+    assert_parse rb, pt
+  end
+
+  def test_pctW_lineno
+    rb = "%W(a\\nb\nc\ d\ne\\\nf\ng\y h\\y i\\\y)"
+    pt = s(:array,
+           s(:str, "a\nb"),
+           s(:str, "c").line(2),
+           s(:str, "d").line(2),
+           s(:str, "e\nf").line(3),
+           s(:str, "gy").line(5),
+           s(:str, "hy").line(5),
+           s(:str, "iy").line(5))
+
+    assert_parse rb, pt
+  end
+
   def test_heredoc_bad_oct_escape
     rb = "s = <<-EOS\na\\247b\ncöd\nEOS\n"
     pt = s(:lasgn, :s, s(:str, "a\xa7b\nc\xc3\xb6d\n".b))
@@ -932,14 +973,17 @@ module TestRubyParserShared
 
   def test_heredoc_with_interpolation_and_carriage_return_escapes
     rb = "<<EOS\nfoo\\r\#@bar\nEOS\n"
-    pt = s(:dstr, "foo\r", s(:evstr, s(:ivar, :@bar)), s(:str, "\n"))
+    pt = s(:dstr, "foo\r", s(:evstr, s(:ivar, :@bar).line(2)).line(2), s(:str, "\n").line(2))
 
     assert_parse rb, pt
   end
 
   def test_heredoc_with_interpolation_and_carriage_return_escapes_windows
     rb = "<<EOS\r\nfoo\\r\#@bar\r\nEOS\r\n"
-    pt = s(:dstr, "foo\r", s(:evstr, s(:ivar, :@bar)), s(:str, "\n"))
+    pt = s(:dstr,
+           "foo\r",
+           s(:evstr, s(:ivar, :@bar).line(2)).line(2),
+           s(:str, "\n").line(2))
 
     assert_parse rb, pt
   end
@@ -981,7 +1025,7 @@ module TestRubyParserShared
       end
     END
 
-    pt = s(:if, s(:true).line(1),
+    pt = s(:if, s(:true),
            s(:block,
              s(:call, nil, :p, s(:lit, 1).line(2)).line(2),
              s(:call, s(:call, nil, :a).line(3), :b,
@@ -1001,7 +1045,7 @@ module TestRubyParserShared
                s(:lit, 5).line(10)).line(10),
              s(:call, s(:call, nil, :g).line(11), :h,
                s(:lit, 6).line(11), s(:lit, 7).line(11)).line(11)).line(2),
-           nil).line(1)
+           nil)
 
     assert_parse rb, pt
   end
@@ -1018,14 +1062,14 @@ module TestRubyParserShared
     EOM
 
     pt = s(:block,
-           s(:if, s(:true).line(1),
+           s(:if, s(:true),
              s(:block,
                s(:call, nil, :p, s(:str, "a").line(2)).line(2),
                s(:lasgn, :b, s(:lit, 1).line(3)).line(3),
                s(:call, nil, :p, s(:lvar, :b).line(4)).line(4),
                s(:lasgn, :c, s(:lit, 1).line(5)).line(5)).line(2),
-             nil).line(1),
-           s(:call, nil, :a).line(7)).line(1)
+             nil),
+           s(:call, nil, :a).line(7))
 
     assert_parse rb, pt
   end
@@ -1056,7 +1100,7 @@ module TestRubyParserShared
     pt = s(:block,
            s(:array,
              s(:str, "a").line(2),
-             s(:str, "b").line(3)).line(1),
+             s(:str, "b").line(3)),
            s(:lit, 1).line(5))
     assert_parse rb, pt
   end
@@ -1217,14 +1261,14 @@ module TestRubyParserShared
   def test_logical_op_12
     lhs = s(:lit, 1).line 1
     rhs = s(:lit, 2).line 2
-    exp = s(:and, s(:lit, 1).line(1), s(:lit, 2).line(2)).line 1
+    exp = s(:and, s(:lit, 1), s(:lit, 2).line(2)).line 1
 
     assert_equal exp, processor.logical_op(:and, lhs, rhs)
   end
 
   def test_logical_op_1234_5
     lhs = s(:and,
-            s(:lit, 1).line(1),
+            s(:lit, 1),
             s(:and,
               s(:lit, 2).line(2),
               s(:and,
@@ -1232,7 +1276,7 @@ module TestRubyParserShared
                 s(:lit, 4).line(4)).line(3)).line(2)).line 1
     rhs = s(:lit, 5).line(5)
     exp = s(:and,
-            s(:lit, 1).line(1),
+            s(:lit, 1),
             s(:and,
               s(:lit, 2).line(2),
               s(:and,
@@ -1246,13 +1290,13 @@ module TestRubyParserShared
 
   def test_logical_op_123_4
     lhs = s(:and,
-            s(:lit, 1).line(1),
+            s(:lit, 1),
             s(:and,
               s(:lit, 2).line(2),
               s(:lit, 3).line(3)).line(2)).line 1
     rhs = s(:lit, 4).line 4
     exp = s(:and,
-            s(:lit, 1).line(1),
+            s(:lit, 1),
             s(:and,
               s(:lit, 2).line(2),
               s(:and,
@@ -1264,11 +1308,11 @@ module TestRubyParserShared
 
   def test_logical_op_12_3
     lhs = s(:and,
-            s(:lit, 1).line(1),
+            s(:lit, 1),
             s(:lit, 2).line(2)).line 1
     rhs = s(:lit, 3).line 3
     exp = s(:and,
-            s(:lit, 1).line(1),
+            s(:lit, 1),
             s(:and,
               s(:lit, 2).line(2),
               s(:lit, 3).line(3)).line(2)).line 1
@@ -1278,15 +1322,15 @@ module TestRubyParserShared
 
   def test_logical_op_nested_mix
     lhs = s(:or,
-            s(:call, nil, :a).line(1),
+            s(:call, nil, :a),
             s(:call, nil, :b).line(2)).line 1
     rhs = s(:and,
             s(:call, nil, :c).line(3),
             s(:call, nil, :d).line(4)).line 3
     exp = s(:or,
             s(:or,
-              s(:call, nil, :a).line(1),
-              s(:call, nil, :b).line(2)).line(1),
+              s(:call, nil, :a),
+              s(:call, nil, :b).line(2)),
             s(:and,
               s(:call, nil, :c).line(3),
               s(:call, nil, :d).line(4)).line(3)).line 1
@@ -1307,8 +1351,8 @@ module TestRubyParserShared
     # TODO: globals
 
     pt = s(:class, :"ExampleUTF8ClassNameVariet\303\240", nil,
-           s(:defs, s(:self), :"\303\250", s(:args),
-             s(:lasgn, :"cos\303\254", s(:lit, :"per\303\262"))))
+           s(:defs, s(:self).line(2), :"\303\250", s(:args).line(2),
+             s(:lasgn, :"cos\303\254", s(:lit, :"per\303\262").line(2)).line(2)).line(2)).line(2)
 
     err = RUBY_VERSION =~ /^1\.8/ ? "Skipping magic encoding comment\n" : ""
 
@@ -1319,14 +1363,14 @@ module TestRubyParserShared
 
   def test_magic_encoding_comment__bad
     rb = "#encoding: bunk\n0"
-    pt = s(:lit, 0)
+    pt = s(:lit, 0).line(2)
 
     assert_parse rb, pt
   end
 
   def test_utf8_bom
     rb = "\xEF\xBB\xBF#!/usr/bin/env ruby -w\np 0\n"
-    pt = s(:call, nil, :p, s(:lit, 0))
+    pt = s(:call, nil, :p, s(:lit, 0).line(2)).line(2)
 
     assert_parse rb, pt
   end
@@ -1335,12 +1379,12 @@ module TestRubyParserShared
     rb = "a, b::c = d"
     pt = s(:masgn,
            s(:array,
-             s(:lasgn, :a).line(1),
+             s(:lasgn, :a),
              s(:attrasgn,
-               s(:call, nil, :b).line(1),
-               :c=).line(1)).line(1),
+               s(:call, nil, :b),
+               :c=)),
            s(:to_ary,
-             s(:call, nil, :d).line(1)).line(1)).line(1)
+             s(:call, nil, :d)))
 
     assert_parse rb, pt
   end
@@ -1420,7 +1464,7 @@ module TestRubyParserShared
   def test_module_comments
     rb = "# blah 1\n  \n  # blah 2\n\nmodule X\n  # blah 3\n  def blah\n    # blah 4\n  end\nend"
     pt = s(:module, :X,
-           s(:defn, :blah, s(:args), s(:nil)))
+           s(:defn, :blah, s(:args).line(7), s(:nil).line(7)).line(7)).line(5)
 
     assert_parse rb, pt
     assert_equal "# blah 1\n\n# blah 2\n\n", result.comments
@@ -1432,7 +1476,7 @@ module TestRubyParserShared
     pt = s(:block,
            s(:array,
              s(:str, "a").line(2),
-             s(:str, "b").line(3)).line(1),
+             s(:str, "b").line(3)),
            s(:lit, 1).line(5))
     assert_parse rb, pt
   end
@@ -1557,17 +1601,11 @@ module TestRubyParserShared
     rb = "a = 42\np a"
     pt = s(:block,
            s(:lasgn, :a, s(:lit, 42)),
-           s(:call, nil, :p, s(:lvar, :a)))
+           s(:call, nil, :p, s(:lvar, :a).line(2)).line(2))
 
-    assert_parse_line rb, pt, 1
-    assert_equal 1, result.lasgn.line, "lasgn should have line number"
-    assert_equal 2, result.call.line,  "call should have line number"
-
-    expected = "(string)"
-    assert_equal expected, result.file
-    assert_equal expected, result.lasgn.file
-    assert_equal expected, result.call.file
+    assert_parse rb, pt
 
+    assert_equal "(string)", result.file
     assert_same result.file, result.lasgn.file
     assert_same result.file, result.call.file
   end
@@ -1575,7 +1613,7 @@ module TestRubyParserShared
   def test_parse_line_block_inline_comment
     rb = "a\nb # comment\nc"
     pt = s(:block,
-           s(:call, nil, :a).line(1),
+           s(:call, nil, :a),
            s(:call, nil, :b).line(2),
            s(:call, nil, :c).line(3))
 
@@ -1595,23 +1633,23 @@ module TestRubyParserShared
   def test_parse_line_block_inline_multiline_comment
     rb = "a\nb # comment\n# another comment\nc"
     pt = s(:block,
-           s(:call, nil, :a).line(1),
+           s(:call, nil, :a),
            s(:call, nil, :b).line(2),
-           s(:call, nil, :c).line(4)).line(1)
+           s(:call, nil, :c).line(4))
 
     assert_parse rb, pt
   end
 
   def test_parse_line_call_ivar_arg_no_parens_line_break
     rb = "a @b\n"
-    pt = s(:call, nil, :a, s(:ivar, :@b).line(1)).line(1)
+    pt = s(:call, nil, :a, s(:ivar, :@b))
 
     assert_parse rb, pt
   end
 
   def test_parse_line_call_ivar_line_break_paren
     rb = "a(@b\n)"
-    pt = s(:call, nil, :a, s(:ivar, :@b).line(1)).line(1)
+    pt = s(:call, nil, :a, s(:ivar, :@b))
 
     assert_parse rb, pt
   end
@@ -1622,9 +1660,9 @@ module TestRubyParserShared
     pt = s(:iter,
            s(:call, nil, :f),
            s(:args, :x, :y),
-           s(:call, s(:lvar, :x), :+, s(:lvar, :y)))
+           s(:call, s(:lvar, :x).line(2), :+, s(:lvar, :y).line(2)).line(2))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
 
     _, a, b, c, = result
 
@@ -1635,19 +1673,19 @@ module TestRubyParserShared
 
   def test_parse_line_defn_no_parens_args
     rb = "def f a\nend"
-    pt = s(:defn, :f, s(:args, :a).line(1), s(:nil).line(2)).line(1)
+    pt = s(:defn, :f, s(:args, :a), s(:nil))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_defn_complex
     rb = "def x(y)\n  p(y)\n  y *= 2\n  return y;\nend" # TODO: remove () & ;
     pt = s(:defn, :x, s(:args, :y),
-           s(:call, nil, :p, s(:lvar, :y)),
-           s(:lasgn, :y, s(:call, s(:lvar, :y), :*, s(:lit, 2))),
-           s(:return, s(:lvar, :y)))
+           s(:call, nil, :p, s(:lvar, :y).line(2)).line(2),
+           s(:lasgn, :y, s(:call, s(:lvar, :y).line(3), :*, s(:lit, 2).line(3)).line(3)).line(3),
+           s(:return, s(:lvar, :y).line(4)).line(4))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
 
     body = result
     assert_equal 2, body.call.line,   "call should have line number"
@@ -1656,61 +1694,65 @@ module TestRubyParserShared
   end
 
   def test_parse_line_defn_no_parens
-    pt = s(:defn, :f, s(:args).line(1), s(:nil)).line(1)
+    pt = s(:defn, :f, s(:args), s(:nil))
 
     rb = "def f\nend"
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
 
     processor.reset
 
     rb = "def f\n\nend"
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_dot2
     rb = "0..\n4\na..\nb\nc"
     pt = s(:block,
-           s(:lit, 0..4).line(1),
+           s(:lit, 0..4),
            s(:dot2,
              s(:call, nil, :a).line(3),
              s(:call, nil, :b).line(4)).line(3),
-           s(:call, nil, :c).line(5)).line(1)
+           s(:call, nil, :c).line(5))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_dot3
     rb = "0...\n4\na...\nb\nc"
     pt = s(:block,
-           s(:lit, 0...4).line(1),
+           s(:lit, 0...4),
            s(:dot3,
              s(:call, nil, :a).line(3),
              s(:call, nil, :b).line(4)).line(3),
-           s(:call, nil, :c).line(5)).line(1)
+           s(:call, nil, :c).line(5))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
-  def test_parse_line_dstr_newline
-    rb = <<-'CODE'
-            "a\n#{
-            }"
-            true
-    CODE
-
+  def test_parse_line_dstr_escaped_newline
+    rb = "\"a\\n\#{\n}\"\ntrue"
     pt = s(:block,
            s(:dstr, "a\n",
-             s(:evstr)).line(1),
+             s(:evstr)),
            s(:true).line(3))
 
     assert_parse rb, pt
   end
 
+  def test_parse_line_dstr_soft_newline
+    rb = "\"a\n#\{\n}\"\ntrue"
+    pt = s(:block,
+           s(:dstr, "a\n", s(:evstr).line(2)),
+           s(:true).line(4))
+
+    assert_parse rb, pt
+  end
+
   def test_parse_line_evstr_after_break
     rb = "\"a\"\\\n\"\#{b}\""
     pt = s(:dstr, "a",
            s(:evstr,
-             s(:call, nil, :b).line(2)).line(2)).line(1)
+             s(:call, nil, :b).line(2)).line(2))
 
     assert_parse rb, pt
   end
@@ -1719,14 +1761,14 @@ module TestRubyParserShared
     rb = "{\n:s1 => 1,\n}"
     pt = s(:hash,
            s(:lit, :s1).line(2), s(:lit, 1).line(2),
-          ).line(1)
+          )
 
     assert_parse rb, pt
   end
 
   def test_parse_line_heredoc
     rb = <<-CODE
-      string = <<-HEREDOC
+      string = <<-HEREDOC.strip
         very long string
       HEREDOC
       puts string
@@ -1734,20 +1776,23 @@ module TestRubyParserShared
 
     pt = s(:block,
            s(:lasgn, :string,
-             s(:str, "        very long string\n").line(1)).line(1),
-           s(:call, nil, :puts, s(:lvar, :string).line(4)).line(4)).line(1)
+             s(:call,
+               s(:str, "        very long string\n"),
+               :strip),
+              ),
+           s(:call, nil, :puts,
+             s(:lvar, :string).line(4)).line(4)
+          )
 
     assert_parse rb, pt
   end
 
   def test_parse_line_heredoc_evstr
-    skip "heredoc line numbers are just gonna be screwed for a while..."
-
     rb = "<<-A\na\n\#{b}\nA"
-    pt = s(:dstr, "a\n",
-           s(:evstr,
-             s(:call, nil, :b).line(3)),
-             s(:str, "\n")).line(1)
+    pt = s(:dstr,
+           "a\n",
+           s(:evstr, s(:call, nil, :b).line(3)).line(3), s(:str, "\n").line(3)
+          )
 
     assert_parse rb, pt
   end
@@ -1762,8 +1807,8 @@ module TestRubyParserShared
 
     pt = s(:block,
            s(:lasgn, :string,
-             s(:str, "        very long string\n").line(1)).line(1),
-           s(:call, nil, :puts, s(:lvar, :string).line(4)).line(4)).line(1)
+             s(:str, "        very long string\n")),
+           s(:call, nil, :puts, s(:lvar, :string).line(4)).line(4))
 
     assert_parse rb, pt
   end
@@ -1772,10 +1817,10 @@ module TestRubyParserShared
     rb = "f a do |x, y|\n  x + y\nend"
 
     pt = s(:iter,
-           s(:call, nil, :f, s(:call, nil, :a).line(1)).line(1),
-           s(:args, :x, :y).line(1),
+           s(:call, nil, :f, s(:call, nil, :a)),
+           s(:args, :x, :y),
            s(:call, s(:lvar, :x).line(2), :+,
-             s(:lvar, :y).line(2)).line(2)).line(1)
+             s(:lvar, :y).line(2)).line(2))
 
     assert_parse rb, pt
   end
@@ -1786,9 +1831,9 @@ module TestRubyParserShared
     pt = s(:iter,
            s(:call, nil, :f, s(:call, nil, :a)),
            s(:args, :x, :y),
-           s(:call, s(:lvar, :x), :+, s(:lvar, :y)))
+           s(:call, s(:lvar, :x).line(2), :+, s(:lvar, :y).line(2)).line(2))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
 
     _, a, b, c, = result
 
@@ -1800,8 +1845,8 @@ module TestRubyParserShared
   def test_parse_line_multiline_str
     rb = "\"a\nb\"\n1"
     pt = s(:block,
-           s(:str, "a\nb").line(1),
-           s(:lit, 1).line(3)).line(1)
+           s(:str, "a\nb"),
+           s(:lit, 1).line(3))
 
     assert_parse rb, pt
   end
@@ -1809,8 +1854,8 @@ module TestRubyParserShared
   def test_parse_line_multiline_str_literal_n
     rb = "\"a\\nb\"\n1"
     pt = s(:block,
-           s(:str, "a\nb").line(1),
-           s(:lit, 1).line(2)).line(1)
+           s(:str, "a\nb"),
+           s(:lit, 1).line(2))
 
     assert_parse rb, pt
   end
@@ -1819,7 +1864,7 @@ module TestRubyParserShared
     rb = "true\n\n"
     pt = s(:true)
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_op_asgn
@@ -1832,30 +1877,30 @@ module TestRubyParserShared
     pt = s(:block,
            s(:lasgn, :foo,
              s(:call,
-               s(:lvar, :foo).line(1),
+               s(:lvar, :foo),
                :+,
-               s(:call, nil, :bar).line(2)).line(1)).line(1),
-           s(:call, nil, :baz).line(3)).line(1)
+               s(:call, nil, :bar).line(2))),
+           s(:call, nil, :baz).line(3))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_postexe
     rb = "END {\nfoo\n}"
     pt = s(:iter,
-           s(:postexe).line(1), 0,
-           s(:call, nil, :foo).line(2)).line(1)
+           s(:postexe), 0,
+           s(:call, nil, :foo).line(2))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_preexe
     rb = "BEGIN {\nfoo\n}"
     pt = s(:iter,
-           s(:preexe).line(1), 0,
-           s(:call, nil, :foo).line(2)).line(1)
+           s(:preexe), 0,
+           s(:call, nil, :foo).line(2))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_rescue
@@ -1867,7 +1912,7 @@ module TestRubyParserShared
            s(:resbody, s(:array).line(5),
              s(:call, nil, :c).line(6)).line(5)).line(2)
 
-    assert_parse_line rb, pt, 2
+    assert_parse rb, pt
   end
 
   def test_parse_line_return
@@ -1880,11 +1925,11 @@ module TestRubyParserShared
     RUBY
 
     pt = s(:defn, :blah, s(:args),
-           s(:if, s(:true),
-             s(:return, s(:lit, 42)),
-             nil))
+           s(:if, s(:true).line(2),
+             s(:return, s(:lit, 42).line(3)).line(3),
+             nil).line(2))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
 
     assert_equal 3, result.if.return.line
     assert_equal 3, result.if.return.lit.line
@@ -1893,8 +1938,8 @@ module TestRubyParserShared
   def test_parse_line_str_with_newline_escape
     rb = 'a("\n", true)'
     pt = s(:call, nil, :a,
-           s(:str, "\n").line(1),
-           s(:true).line(1))
+           s(:str, "\n"),
+           s(:true))
 
     assert_parse rb, pt
   end
@@ -1903,18 +1948,18 @@ module TestRubyParserShared
     rb = "a,\nb = c\nd"
     pt = s(:block,
            s(:masgn,
-             s(:array, s(:lasgn, :a).line(1), s(:lasgn, :b).line(2)).line(1),
-             s(:to_ary, s(:call, nil, :c).line(2)).line(2)).line(1),
-           s(:call, nil, :d).line(3)).line(1)
+             s(:array, s(:lasgn, :a), s(:lasgn, :b).line(2)),
+             s(:to_ary, s(:call, nil, :c).line(2)).line(2)),
+           s(:call, nil, :d).line(3))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_trailing_newlines
     rb = "a \nb"
     pt = s(:block,
-           s(:call, nil, :a).line(1),
-           s(:call, nil, :b).line(2)).line(1)
+           s(:call, nil, :a),
+           s(:call, nil, :b).line(2))
 
     assert_parse rb, pt
   end
@@ -2026,7 +2071,9 @@ module TestRubyParserShared
 
   def test_str_heredoc_interp
     rb = "<<\"\"\n\#{x}\nblah2\n\n"
-    pt = s(:dstr, "", s(:evstr, s(:call, nil, :x)), s(:str, "\nblah2\n"))
+    pt = s(:dstr, "",
+           s(:evstr, s(:call, nil, :x).line(2)).line(2),
+           s(:str, "\nblah2\n").line(2))
 
     assert_parse rb, pt
   end
@@ -2049,19 +2096,19 @@ module TestRubyParserShared
 
   def test_str_newline_hash_line_number
     rb = "\"\\n\\n\\n\\n#\"\n1"
-    pt = s(:block, s(:str, "\n\n\n\n#").line(1),
+    pt = s(:block, s(:str, "\n\n\n\n#"),
                    s(:lit, 1).line(2))
 
     assert_parse rb, pt
   end
 
-  # def test_str_pct_nested_nested
-  #   rb = "%{ { #\{ \"#\{1}\" } } }"
-  #   assert_equal " { 1 } ", eval(rb)
-  #   pt = s(:dstr, " { ", s(:evstr, s(:lit, 1)), s(:str, " } "))
-  #
-  #   assert_parse rb, pt
-  # end
+  def test_str_pct_nested_nested
+    rb = "%{ { #\{ \"#\{1}\" } } }"
+    assert_equal " { 1 } ", eval(rb)
+    pt = s(:dstr, " { ", s(:evstr, s(:lit, 1)), s(:str, " } "))
+
+    assert_parse rb, pt
+  end
 
   def test_str_pct_Q_nested
     rb = "%Q[before [#\{nest}] after]"
@@ -2077,6 +2124,60 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  def test_str_single_newline
+    rp = "a '\n';b"
+    pt = s(:block,
+           s(:call, nil, :a, s(:str, "\n")),
+           s(:call, nil, :b).line(2))
+
+    assert_parse rp, pt
+  end
+
+  def test_str_single_escaped_newline
+    rp = "a '\\n';b"
+    pt = s(:block,
+           s(:call, nil, :a, s(:str, "\\n")),
+           s(:call, nil, :b))
+
+    assert_parse rp, pt
+  end
+
+  def test_str_single_double_escaped_newline
+    rp = "a '\\\\n';b"
+    pt = s(:block,
+           s(:call, nil, :a, s(:str, "\\n")),
+           s(:call, nil, :b))
+
+    assert_parse rp, pt
+  end
+
+  def test_str_double_newline
+    rp = "a \"\n\";b"
+    pt = s(:block,
+           s(:call, nil, :a, s(:str, "\n")),
+           s(:call, nil, :b).line(2))
+
+    assert_parse rp, pt
+  end
+
+  def test_str_double_escaped_newline
+    rp = "a \"\\n\";b"
+    pt = s(:block,
+           s(:call, nil, :a, s(:str, "\n")),
+           s(:call, nil, :b))
+
+    assert_parse rp, pt
+  end
+
+  def test_str_double_double_escaped_newline
+    rp = "a \"\\\\n\";b"
+    pt = s(:block,
+           s(:call, nil, :a, s(:str, "\\n")),
+           s(:call, nil, :b))
+
+    assert_parse rp, pt
+  end
+
   def test_str_str
     rb = "\"a #\{'b'}\""
     pt = s(:str, "a b")
@@ -2464,7 +2565,7 @@ module TestRubyParserShared19Plus
            nil,
            :private,
            s(:defn, :f, s(:args),
-             s(:iter, s(:call, s(:call, nil, :a), :b), 0)))
+             s(:iter, s(:call, s(:call, nil, :a).line(2), :b).line(2), 0).line(2)))
 
     assert_parse rb, pt
   end
@@ -2542,7 +2643,10 @@ module TestRubyParserShared19Plus
 
   def test_call_assoc_new_if_multiline
     rb = "a(b: if :c\n1\nelse\n2\nend)"
-    pt = s(:call, nil, :a, s(:hash, s(:lit, :b), s(:if, s(:lit, :c), s(:lit, 1), s(:lit, 2))))
+    pt = s(:call, nil, :a,
+           s(:hash,
+             s(:lit, :b),
+             s(:if, s(:lit, :c), s(:lit, 1).line(2), s(:lit, 2).line(4))))
 
     assert_parse rb, pt
   end
@@ -2631,8 +2735,8 @@ module TestRubyParserShared19Plus
   def test_defn_opt_last_arg
     rb = "def m arg = false\nend"
     pt = s(:defn, :m,
-           s(:args, s(:lasgn, :arg, s(:false).line(1)).line(1)).line(1),
-           s(:nil).line(2)).line(1)
+           s(:args, s(:lasgn, :arg, s(:false))),
+           s(:nil))
 
     assert_parse rb, pt
   end
@@ -2689,7 +2793,7 @@ module TestRubyParserShared19Plus
     rb = "1 ? b('') : 2\na d: 3"
     pt = s(:block,
            s(:if, s(:lit, 1), s(:call, nil, :b, s(:str, "")), s(:lit, 2)),
-           s(:call, nil, :a, s(:hash, s(:lit, :d), s(:lit, 3))))
+           s(:call, nil, :a, s(:hash, s(:lit, :d).line(2), s(:lit, 3).line(2)).line(2)).line(2))
 
     assert_parse rb, pt
   end
@@ -3079,6 +3183,31 @@ module TestRubyParserShared19Plus
     assert_parse rb, pt
   end
 
+  def test_call_leading_dots
+    rb = "a\n.b\n.c"
+    pt = s(:call, s(:call, s(:call, nil, :a), :b), :c)
+
+    assert_parse rb, pt
+  end
+
+  def test_call_leading_dots_comment
+    rb = "a\n.b\n#.c\n.d"
+    pt = s(:call,
+           s(:call,
+             s(:call, nil, :a),
+             :b),
+           :d) # TODO: fix linenos: 1, 2, 4
+
+    assert_parse rb, pt
+  end
+
+  def test_call_trailing_dots
+    rb = "a.\nb.\nc"
+    pt = s(:call, s(:call, s(:call, nil, :a), :b), :c)
+
+    assert_parse rb, pt
+  end
+
   def test_motherfuckin_leading_dots
     rb = "a\n.b"
     pt = s(:call, s(:call, nil, :a), :b)
@@ -3087,9 +3216,15 @@ module TestRubyParserShared19Plus
   end
 
   def test_motherfuckin_leading_dots2
-    rb = "a\n..b"
+    rb = "1\n..3"
+    pt = s(:block, s(:lit, 1),
+           s(:dot2, nil, s(:lit, 3).line(2)).line(2))
 
-    assert_parse_error rb, '(string):2 :: parse error on value ".." (tDOT2)'
+    if processor.class.version >= 27
+      assert_parse rb, pt
+    else
+      assert_parse_error rb, '(string):2 :: parse error on value ".." (tDOT2)'
+    end
   end
 
   def test_multiline_hash_declaration
@@ -3097,6 +3232,8 @@ module TestRubyParserShared19Plus
 
     assert_parse "f(state: {})",     pt
     assert_parse "f(state: {\n})",   pt
+
+    pt = s(:call, nil, :f, s(:hash, s(:lit, :state), s(:hash).line(2)))
     assert_parse "f(state:\n {\n})", pt
   end
 
@@ -3159,7 +3296,7 @@ module TestRubyParserShared19Plus
     rb = "until not var.nil?\n  'foo'\nend"
     pt = s(:until,
            s(:call, s(:call, s(:call, nil, :var), :nil?), :"!"),
-           s(:str, "foo"), true)
+           s(:str, "foo").line(2), true)
 
     assert_parse rb, pt
   end
@@ -3168,7 +3305,7 @@ module TestRubyParserShared19Plus
     rb = "until not var.nil?\n  'foo'\nend"
     pt = s(:until,
            s(:call, s(:call, s(:call, nil, :var), :nil?), :"!"),
-           s(:str, "foo"), true)
+           s(:str, "foo").line(2), true)
 
     processor.canonicalize_conditions = false
 
@@ -3179,7 +3316,7 @@ module TestRubyParserShared19Plus
     rb = "while not var.nil?\n  'foo'\nend"
     pt = s(:while,
            s(:call, s(:call, s(:call, nil, :var), :nil?), :"!"),
-           s(:str, "foo"), true)
+           s(:str, "foo").line(2), true)
 
     assert_parse rb, pt
   end
@@ -3188,7 +3325,7 @@ module TestRubyParserShared19Plus
     rb = "while not var.nil?\n  'foo'\nend"
     pt = s(:while,
            s(:call, s(:call, s(:call, nil, :var), :nil?), :"!"),
-           s(:str, "foo"), true)
+           s(:str, "foo").line(2), true)
 
     processor.canonicalize_conditions = false
 
@@ -3352,14 +3489,16 @@ module TestRubyParserShared19Plus
     RUBY
 
     pt = s(:hash,
-           s(:lit, :a),
+           s(:lit, :a).line(2),
            s(:iter,
-             s(:call, nil, :lambda),
+             s(:call, nil, :lambda).line(2),
              0,
-             s(:if, s(:call, nil, :b), s(:call, nil, :c), s(:call, nil, :d))),
+             s(:if, s(:call, nil, :b).line(2),
+               s(:call, nil, :c).line(2),
+               s(:call, nil, :d).line(2)).line(2)).line(2),
 
-           s(:lit, :e),
-           s(:nil))
+           s(:lit, :e).line(3),
+           s(:nil).line(3))
 
     assert_parse rb, pt
   end
@@ -3368,6 +3507,98 @@ end
 module TestRubyParserShared20Plus
   include TestRubyParserShared19Plus
 
+  def test_read_escape_unicode_h4
+    rb = '?\u00a0'
+    pt = s(:str, ?\u00a0)
+
+    assert_parse rb, pt
+  end
+
+  def test_read_escape_unicode_curlies
+    rb = '?\u{00a0}'
+    pt = s(:str, ?\u00a0)
+
+    assert_parse rb, pt
+  end
+
+  def test_regexp_unicode_curlies
+    rb = '/\u{df}/'
+    pt = s(:lit, /\u{df}/)
+
+    assert_parse rb, pt
+
+    rb = '/\u{c0de babe}/'
+    pt = s(:lit, /\u{c0de babe}/)
+
+    assert_parse rb, pt
+  end
+
+  def test_qw_escape
+    rb = "%q(\1\\\')"
+    pt = s(:str, "\001\\'")
+
+    assert_parse rb, pt
+  end
+
+  def test_pct_nl
+    rb = "x = %\n\n"
+    pt = s(:lasgn, :x, s(:str, ""))
+
+    assert_parse rb, pt
+  end
+
+  def test_regexp_esc_C_slash
+    rb = "/\\cC\\d/"
+    pt = s(:lit, Regexp.new('\cC\d')) # https://bugs.ruby-lang.org/issues/18449
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_wtf_I_hate_you
+    rb = "p <<-END+'b\n  a\n  END\n  c'+'d'"
+    pt = s(:call, nil, :p,
+           s(:call,
+             s(:call, s(:str, "  a\n"), :+,
+               s(:str, "b\n  c")),
+             :+, s(:str, "d").line(4)))
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_nested
+    rb = "[<<A,\n\#{<<B}\nb\nB\na\nA\n0]"
+    pt = s(:array, s(:str, "b\n\na\n"),
+           s(:lit, 0).line(7))
+
+    assert_parse rb, pt
+  end
+
+  def test_pct_w_heredoc_interp_nested
+    rb = "%W( 1 \#{<<A} 3\n2\nA\n      4 5 )"
+    pt = s(:array,
+           s(:str, "1"),
+           s(:str, "2\n"),
+           s(:str, "3"),
+           s(:str, "4").line(4),
+           s(:str, "5").line(4))
+
+    assert_parse rb, pt
+  end
+
+  def test_regexp_esc_u
+    rb = "/[\\u0021-\\u0027]/"
+    pt = s(:lit, /[\u0021-\u0027]/)
+
+    assert_parse rb, pt
+  end
+
+  def test_qw_escape_term
+    rb = "%q|blah blah \\| blah blah|"
+    pt = s(:str, "blah blah | blah blah")
+
+    assert_parse rb, pt
+  end
+
   def test_args_kw_block
     rb = "def f(a: 1, &b); end"
     pt = s(:defn, :f, s(:args, s(:kwarg, :a, s(:lit, 1)), :"&b"), s(:nil))
@@ -3375,6 +3606,49 @@ module TestRubyParserShared20Plus
     assert_parse rb, pt
   end
 
+  def test_heredoc_backslash_nl
+    rb = %Q("  why would someone do this? \\\n  blah\n")
+    pt = s(:str, "  why would someone do this?   blah\n")
+
+    assert_parse rb, pt
+
+    rb = "<<-DESC\n  why would someone do this? \\\n  blah\nDESC"
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_comma_arg
+    rb = "[\"  some text\n\",]"
+    pt = s(:array, s(:str, "  some text\n"))
+
+    assert_parse rb, pt
+
+    rb = "[<<-FILE,\n  some text\nFILE\n]"
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_trailing_slash_continued_call
+    rb = "<<END\\\nblah\nEND\n.strip"
+    pt = s(:call, s(:str, "blah\n"), :strip)
+
+    assert_parse rb, pt
+  end
+
+  def test_pct_q_backslash_nl
+    rb = "%q{ \\\n}"
+    pt = s(:str, " \\\n")
+
+    assert_parse rb, pt
+  end
+
+  def test_pct_Q_backslash_nl
+    rb = "%Q{ \\\n}"
+    pt = s(:str, " ")
+
+    assert_parse rb, pt
+  end
+
   def test_block_arg_kwsplat
     rb = "a { |**b| }"
     pt = s(:iter, s(:call, nil, :a), s(:args, :"**b"))
@@ -3411,7 +3685,7 @@ module TestRubyParserShared20Plus
     rb = "a (b)\nc.d do end"
     pt = s(:block,
            s(:call, nil, :a, s(:call, nil, :b)),
-           s(:iter, s(:call, s(:call, nil, :c), :d), 0))
+           s(:iter, s(:call, s(:call, nil, :c).line(2), :d).line(2), 0).line(2))
 
 
     assert_parse rb, pt
@@ -3421,8 +3695,9 @@ module TestRubyParserShared20Plus
     rb = "a def b(c)\n d\n end\n e.f do end"
     pt = s(:block,
            s(:call, nil, :a,
-             s(:defn, :b, s(:args, :c), s(:call, nil, :d))),
-           s(:iter, s(:call, s(:call, nil, :e), :f), 0))
+             s(:defn, :b, s(:args, :c),
+               s(:call, nil, :d).line(2))),
+           s(:iter, s(:call, s(:call, nil, :e).line(4), :f).line(4), 0).line(4))
 
     assert_parse rb, pt
   end
@@ -3440,7 +3715,9 @@ module TestRubyParserShared20Plus
   def test_call_begin_call_block_call
     rb = "a begin\nb.c do end\nend"
     pt = s(:call, nil, :a,
-           s(:iter, s(:call, s(:call, nil, :b), :c), 0))
+           s(:iter,
+             s(:call, s(:call, nil, :b).line(2), :c).line(2),
+             0).line(2))
 
     assert_parse rb, pt
   end
@@ -3451,7 +3728,7 @@ module TestRubyParserShared20Plus
            s(:op_asgn, s(:const, :B),
              s(:call, nil, :d, s(:call, nil, :e)),
              :C,
-             :*)).line(1)
+             :*))
 
     assert_parse rb, pt
   end
@@ -3509,9 +3786,9 @@ module TestRubyParserShared20Plus
              s(:iter,
                s(:call, s(:const, :Class), :new),
                0,
-               s(:defn, :initialize, s(:args), s(:nil))),
+               s(:defn, :initialize, s(:args).line(2), s(:nil).line(2)).line(2)),
              :new),
-           s(:hash, s(:lit, :at), s(:str, "endpoint")))
+           s(:hash, s(:lit, :at).line(4), s(:str, "endpoint").line(4)).line(4))
 
     assert_parse rb, pt
   end
@@ -3618,20 +3895,23 @@ module TestRubyParserShared20Plus
     pt = s(:block,
            s(:array,
              s(:lit, :a).line(2),
-             s(:lit, :b).line(3)).line(1),
+             s(:lit, :b).line(3)),
            s(:lit, 1).line(5))
     assert_parse rb, pt
   end
 
   def test_iter_array_curly
-    skip if processor.class.version >= 25
-
     rb = "f :a, [:b] { |c, d| }" # yes, this is bad code... that's their problem
     pt = s(:iter,
            s(:call, nil, :f, s(:lit, :a), s(:array, s(:lit, :b))),
            s(:args, :c, :d))
 
-    assert_parse rb, pt
+    if processor.class.version >= 25 then
+      msg = /parse error on value "\{" \(tLCURLY\)/
+      assert_syntax_error rb, msg, Racc::ParseError
+    else
+      assert_parse rb, pt
+    end
   end
 
   def test_iter_kwarg
@@ -3653,7 +3933,7 @@ module TestRubyParserShared20Plus
     pt = s(:block,
            s(:array,
              s(:lit, :a).line(2),
-             s(:lit, :b).line(3)).line(1),
+             s(:lit, :b).line(3)),
            s(:lit, 1).line(5))
     assert_parse rb, pt
   end
@@ -3695,7 +3975,7 @@ module TestRubyParserShared20Plus
            s(:iter,
              s(:lambda),
              s(:args),
-             s(:iter, s(:call, s(:call, nil, :a), :b), 0)))
+             s(:iter, s(:call, s(:call, nil, :a).line(2), :b).line(2), 0).line(2)))
 
     assert_parse rb, pt
   end
@@ -3708,7 +3988,7 @@ module TestRubyParserShared20Plus
              s(:args),
              s(:iter,
                s(:call, nil, :a,
-                 s(:lit, 1)), 0)))
+                 s(:lit, 1).line(2)).line(2), 0).line(2)))
 
     assert_parse rb, pt
   end
@@ -3745,6 +4025,17 @@ end
 module TestRubyParserShared21Plus
   include TestRubyParserShared20Plus
 
+  def test_array_lits_trailing_calls
+    rb = "[].b"
+    pt = s(:call, s(:array), :b)
+
+    assert_parse rb, pt
+
+    rb = "%w[].b"
+
+    assert_parse rb, pt
+  end
+
   def test_block_kw
     rb = "blah { |k:42| }"
     pt = s(:iter, s(:call, nil, :blah), s(:args, s(:kwarg, :k, s(:lit, 42))))
@@ -3767,7 +4058,7 @@ module TestRubyParserShared21Plus
 
   def test_bug162__21plus
     rb = %q(<<E\nfoo\nE\rO)
-    emsg = "can't match /E(\\r*\\n|\\z)/ anywhere in . near line 1: \"\""
+    emsg = "can't match /E(?=\\r?\\n|\\z)/ anywhere in . near line 1: \"\""
 
     assert_syntax_error rb, emsg
   end
@@ -3804,8 +4095,8 @@ module TestRubyParserShared21Plus
     CODE
 
     pt = s(:block,
-           s(:str, "\n\n\n\n\n\n\n\n\n\n").line(1),
-           s(:class, :Foo, nil).line(5)).line(1)
+           s(:str, "\n\n\n\n\n\n\n\n\n\n"),
+           s(:class, :Foo, nil).line(5))
 
     assert_parse rb, pt
   end
@@ -3934,8 +4225,8 @@ module TestRubyParserShared23Plus
   def test_heredoc_squiggly_interp
     rb = "a = <<~EOF\n      w\n  x#\{42} y\n    z\n  EOF"
     pt = s(:lasgn, :a, s(:dstr, "    w\nx",
-                         s(:evstr, s(:lit, 42)),
-                         s(:str, " y\n  z\n")))
+                         s(:evstr, s(:lit, 42).line(3)).line(3),
+                         s(:str, " y\n  z\n").line(3)))
 
     assert_parse rb, pt
   end
@@ -3963,6 +4254,42 @@ module TestRubyParserShared23Plus
     assert_parse rb, pt
   end
 
+  def test_heredoc_squiggly_blank_lines
+    rb = "a = <<~EOF\n  x\n\n  z\nEOF\n\n"
+    pt = s(:lasgn, :a, s(:str, "x\n\nz\n"))
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_squiggly_visually_blank_lines
+    rb = "a = <<~EOF\n  x\n \n  z\nEOF\n\n"
+    pt = s(:lasgn, :a, s(:str, "x\n\nz\n"))
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_squiggly_empty
+    rb = "<<~A\nA"
+    pt = s(:str, "")
+
+    assert_parse rb, pt
+  end
+
+  def test_heredoc_squiggly_blank_line_plus_interpolation
+    rb = "a = foo(<<~EOF.chop)\n\n    #\{bar}baz\n  EOF"
+    pt = s(:lasgn, :a,
+           s(:call,
+             nil,
+             :foo,
+             s(:call,
+               s(:dstr, "\n",
+                 s(:evstr, s(:call, nil, :bar).line(3)).line(3),
+                 s(:str, "baz\n").line(3)).line(1),
+               :chop).line(1)).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
   def test_integer_with_if_modifier
     rb = "1_234if true"
     pt = s(:if, s(:true), s(:lit, 1234), nil)
@@ -4032,7 +4359,7 @@ module TestRubyParserShared23Plus
 
   def test_safe_call_operator
     rb = "a&.> 1"
-    pt = s(:safe_call, s(:call, nil, :a), :>, s(:lit, 1)).line(1)
+    pt = s(:safe_call, s(:call, nil, :a), :>, s(:lit, 1))
 
     assert_parse rb, pt
   end
@@ -4052,15 +4379,16 @@ module TestRubyParserShared23Plus
   end
 
   def test_safe_op_asgn
-    rb = "a&.b += x 1\n"
-    pt = s(:safe_op_asgn, s(:call, nil, :a), s(:call, nil, :x, s(:lit, 1)), :b, :+).line(1)
+    rb = "a&.b += x 1"
+    pt = s(:safe_op_asgn, s(:call, nil, :a), s(:call, nil, :x, s(:lit, 1)), :b, :+)
 
     assert_parse rb, pt
   end
 
   def test_safe_op_asgn2
     rb = "a&.b ||=\nx;"
-    pt = s(:safe_op_asgn2, s(:call, nil, :a), :b=, :"||", s(:call, nil, :x)).line(1)
+    pt = s(:safe_op_asgn2,
+           s(:call, nil, :a), :b=, :"||", s(:call, nil, :x).line(2))
 
     assert_parse rb, pt
   end
@@ -4075,11 +4403,11 @@ a + b
     )
 
     pt = s(:block,
-           s(:call, nil, :puts, s(:str, "hello my dear friend").line(1)).line(1),
+           s(:call, nil, :puts, s(:str, "hello my dear friend")),
            s(:call, s(:call, nil, :a).line(6),
              :+,
              s(:call, nil, :b).line(6)).line(6)
-          ).line(1)
+          )
 
     assert_parse rb, pt
   end
@@ -4115,6 +4443,18 @@ module TestRubyParserShared26Plus
     assert_parse rb, pt
   end
 
+  def test_begin_else_return_value # overrides above, warns < 2.6
+    rb = "begin; else 2; end"
+
+    assert_syntax_error rb, "else without rescue is useless"
+  end
+
+  def test_bug_begin_else # overrides above, warns < 2.6
+    rb = "begin 1; else; 2 end"
+
+    assert_syntax_error rb, "else without rescue is useless"
+  end
+
   def test_dot3_nil__26
     rb = "a..."
     pt = s(:dot3, s(:call, nil, :a), nil)
@@ -4125,17 +4465,1025 @@ module TestRubyParserShared26Plus
   def test_symbol_list
     rb = '%I[#{a} #{b}]'
     pt = s(:array,
-           s(:dsym, "", s(:evstr, s(:call, nil, :a)).line(1)).line(1),
-           s(:dsym, "", s(:evstr, s(:call, nil, :b)).line(1)).line(1)).line 1
+           s(:dsym, "", s(:evstr, s(:call, nil, :a))),
+           s(:dsym, "", s(:evstr, s(:call, nil, :b)))).line 1
 
     assert_parse rb, pt
   end
 end
 
+module TestPatternMatching
+  def rip rb
+    require "ripper"
+    puts
+    pp Sexp.from_array Ripper.sexp rb
+  end
+
+  def assert_case_in lit, exp_pt
+    rb = "case :a\nin #{lit}\nend"
+
+    if ENV["VERBOSE_TEST"] then
+      puts
+      puts rb
+    end
+
+    pt = s(:case, s(:lit, :a),
+           s(:in, exp_pt, nil).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_09
+    assert_case_in(":b, [:c]",
+                   s(:array_pat, nil,
+                     s(:lit, :b).line(2),
+                     s(:array_pat, nil, s(:lit, :c).line(2)).line(2)).line(2))
+  end
+
+  def test_case_in_10
+    assert_case_in "nil, nil, nil", s(:array_pat,
+                                      nil,
+                                      s(:nil).line(2),
+                                      s(:nil).line(2),
+                                      s(:nil).line(2)).line(2)
+  end
+
+  def test_case_in_21
+    assert_case_in "Symbol()", s(:array_pat, s(:const, :Symbol).line(2)).line(2)
+  end
+
+  def test_case_in_26
+    assert_case_in "(42)", s(:lit, 42).line(2)
+  end
+
+  def test_case_in_27
+    assert_case_in("[A, *, B]",
+                   s(:array_pat, nil,
+                     s(:const, :A).line(2),
+                     :*,
+                     s(:const, :B).line(2)).line(2))
+  end
+
+  def test_case_in_28_2
+    assert_case_in '{ "b": }', s(:hash_pat, nil, s(:lit, :b).line(2), nil).line(2)
+  end
+
+  def test_case_in_28
+    assert_case_in "[]", s(:array_pat).line(2)
+  end
+
+  def test_case_in_29
+    assert_case_in "**nil", s(:hash_pat, nil, s(:kwrest, :"**nil").line(2)).line(2)
+  end
+
+  def test_case_in_30
+    assert_case_in "{}", s(:hash_pat, nil).line(2)
+  end
+
+  def test_case_in_31?
+    rb = "case :a\nin [:b, *c]\n  :d\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat, nil, s(:lit, :b).line(2), :"*c").line(2),
+             s(:lit, :d).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_32
+    assert_case_in "(1...3)", s(:dot3, s(:lit, 1).line(2), s(:lit, 3).line(2)).line(2)
+  end
+
+  def test_case_in_33
+    assert_case_in "(1...)", s(:dot3, s(:lit, 1).line(2), nil).line(2)
+  end
+
+  def test_case_in_34
+    assert_case_in "(..10)", s(:dot2, nil, s(:lit, 10).line(2)).line(2)
+  end
+
+  def test_case_in_35
+    assert_case_in "(...10)", s(:dot3, nil, s(:lit, 10).line(2)).line(2)
+  end
+
+  def test_case_in_36
+    rb = "[:a, b, c, [:d, *e, nil]]"
+    pt = s(:array_pat,
+           nil,
+           s(:lit, :a).line(2),
+           s(:lasgn, :b).line(2),
+           s(:lasgn, :c).line(2),
+           s(:array_pat,
+             nil,
+             s(:lit, :d).line(2),
+             :"*e",
+             s(:nil).line(2)).line(2)).line(2)
+
+    assert_case_in rb, pt
+  end
+
+  def test_case_in_37
+    rb = "case :a\nin { b: [Hash, *] }\n  :c\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               nil,
+               s(:lit, :b).line(2),
+               s(:array_pat, nil, s(:const, :Hash).line(2), :"*").line(2)
+              ).line(2),
+             s(:lit, :c).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_42
+    rb = "case :a\nin :b, *_ then nil\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat,
+               nil,
+               s(:lit, :b).line(2),
+               :"*_",
+              ).line(2),
+             s(:nil).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_42_2
+    rb = "case :a\nin A(*list) then nil\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat,
+               s(:const, :A).line(2),
+               :"*list").line(2),
+             s(:nil).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_42_3
+    assert_case_in ":b, *_, :c", s(:array_pat, nil,
+                                   s(:lit, :b).line(2),
+                                   :"*_",
+                                   s(:lit, :c).line(2)).line(2)
+  end
+
+
+  def test_case_in_47
+    rb = "case :a\nin [*, :b, :c]\n  :d\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat, nil, :*,
+               s(:lit, :b).line(2), s(:lit, :c).line(2)).line(2),
+             s(:lit, :d).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_67
+    rb = "case :a\nin 1.. then nil\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in, s(:dot2, s(:lit, 1).line(2), nil).line(2),
+             s(:nil).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_76
+    assert_case_in "`echo hi`", s(:xstr, "echo hi").line(2)
+  end
+
+  def test_case_in_77
+    assert_case_in "/regexp/", s(:lit, /regexp/).line(2)
+  end
+
+  def test_case_in_78
+    assert_case_in "%W[a b]", s(:array_pat, nil, s(:str, "a").line(2), s(:str, "b").line(2)).line(2)
+  end
+
+  def test_case_in_79
+    assert_case_in "%w[a b]", s(:array_pat, nil, s(:str, "a").line(2), s(:str, "b").line(2)).line(2)
+  end
+
+  def test_case_in_80
+    assert_case_in "%I[a b]", s(:array_pat, nil, s(:lit, :a).line(2), s(:lit, :b).line(2)).line(2)
+  end
+
+  def test_case_in_81
+    assert_case_in "%i[a b]", s(:array_pat, nil, s(:lit, :a).line(2), s(:lit, :b).line(2)).line(2)
+  end
+
+  def test_case_in_83
+    rb = "[->(b) { true }, c]"
+    pt = s(:array_pat, nil,
+           s(:iter, s(:lambda).line(2), s(:args, :b).line(2),
+             s(:true).line(2)).line(2),
+           s(:lasgn, :c).line(2)).line(2)
+
+    assert_case_in rb, pt
+  end
+
+  def test_case_in_85
+    rb = "[[:b, c], [:d, ^e]]"
+    pt = s(:array_pat, nil,
+           s(:array_pat, nil,
+             s(:lit, :b).line(2),
+             s(:lasgn, :c).line(2)).line(2),
+           s(:array_pat,
+             nil,
+             s(:lit, :d).line(2),
+             s(:lvar, :e).line(2)).line(2),
+          ).line(2)
+
+    assert_case_in rb, pt
+  end
+
+  def test_case_in_86
+    rb = "case [:a, :b]\nin ::NilClass, * then nil\nend"
+    pt = s(:case,
+           s(:array, s(:lit, :a), s(:lit, :b)),
+           s(:in,
+             s(:array_pat,
+               nil,
+               s(:colon3, :NilClass).line(2),
+               :*).line(2),
+             s(:nil).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_86_2
+    rb = "case [:a, :b]\nin *, ::NilClass then nil\nend"
+    pt = s(:case,
+           s(:array, s(:lit, :a), s(:lit, :b)),
+           s(:in,
+             s(:array_pat,
+               nil,
+               :*,
+               s(:colon3, :NilClass).line(2)).line(2),
+             s(:nil).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_array_pat_const
+    rb = "case :a\nin B[c]\n  :d\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat,
+               s(:const, :B).line(2),
+               s(:lasgn, :c).line(2)).line(2),
+             s(:lit, :d).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_array_pat_const2
+    rb = "case :a\nin B::C[d]\n  :e\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat,
+               s(:const, s(:colon2, s(:const, :B).line(2), :C).line(2)).line(2),
+               s(:lasgn, :d).line(2)).line(2),
+             s(:lit, :e).line(3)).line(2),
+          nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_array_pat_paren_assign
+    rb = "case :a\nin B(C => d)\n  :d\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:array_pat,
+               s(:const, :B).line(2),
+               s(:lasgn, :d, s(:const, :C).line(2)).line(2)).line(2),
+             s(:lit, :d).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_const
+    rb = "case Array\nin Class\n  :b\nend"
+    pt = s(:case, s(:const, :Array),
+           s(:in, s(:const, :Class).line(2),
+             s(:lit, :b).line(3)).line(2),
+           nil).line 1
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_else
+    rb = "case Array\nin Class\n  :b\nelse\n  :c\nend\n"
+    pt = s(:case, s(:const, :Array),
+           s(:in, s(:const, :Class).line(2),
+             s(:lit, :b).line(3)).line(2),
+          s(:lit, :c).line(5)).line 1
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_hash_pat
+    rb = "case :a\nin { b: 'c', d: \"e\" } then\n  :f\nend\n"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               nil,
+               s(:lit, :b).line(2), s(:str, "c").line(2),
+               s(:lit, :d).line(2), s(:str, "e").line(2)).line(2),
+             s(:lit, :f).line(3)
+             ).line(2),
+          nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_hash_pat_assign
+    rb = "case :a\nin { b: Integer => x, d: \"e\", f: } then\n  :g\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               nil,
+               s(:lit, :b).line(2), # =>
+               s(:lasgn, :x, s(:const, :Integer).line(2)).line(2),
+               s(:lit, :d).line(2), s(:str, "e").line(2),
+               s(:lit, :f).line(2), nil).line(2),
+             s(:lit, :g).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_hash_pat_paren_assign
+    rb = "case :a\nin B(a: 42)\n  :d\nend"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               s(:const, :B).line(2),
+               s(:lit, :a).line(2), s(:lit, 42).line(2)).line(2),
+             s(:lit, :d).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_hash_pat_paren_true
+    rb = "case :a\nin b: true then\n  :c\nend\n"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               nil,
+               s(:lit, :b).line(2), s(:true).line(2)).line(2),
+             s(:lit, :c).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_hash_pat_rest
+    rb = "case :a\nin b: c, **rest then :d\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               nil,
+               s(:lit, :b).line(2),
+               s(:lasgn, :c).line(2),
+               s(:kwrest, :"**rest").line(2)).line(2),
+             s(:lit, :d).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_hash_pat_rest_solo
+    rb = "case :a\nin **rest then :d\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:hash_pat,
+               nil,
+               s(:kwrest, :"**rest").line(2)).line(2),
+             s(:lit, :d).line(2)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_if_unless_post_mod
+    rb = "case :a\nin A if true\n  :C\nin D unless false\n  :E\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:if, s(:true).line(2), s(:const, :A).line(2), nil).line(2),
+             s(:lit, :C).line(3)).line(2),
+           s(:in,
+             s(:if, s(:false).line(4), nil, s(:const, :D).line(4)).line(4),
+             s(:lit, :E).line(5)).line(4),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_multiple
+    rb = "case :a\nin A::B\n  :C\nin D::E\n  :F\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:const, s(:colon2, s(:const, :A).line(2), :B).line(2)).line(2),
+             s(:lit, :C).line(3)).line(2),
+           s(:in,
+             s(:const, s(:colon2, s(:const, :D).line(4), :E).line(4)).line(4),
+             s(:lit, :F).line(5)).line(4),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_or
+    rb = "case :a\nin B | C\n  :d\nend\n"
+    pt = s(:case, s(:lit, :a),
+           s(:in,
+             s(:or,
+               s(:const, :B).line(2),
+               s(:const, :C).line(2)).line(2),
+             s(:lit, :d).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_in_expr_no_case
+    rb = "'woot' in String"
+    pt = s(:case, s(:str, "woot"),
+           s(:in, s(:const, :String),
+             nil),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_019
+    rb = <<~RUBY
+        case 0
+        in -1..1
+          true
+        end
+      RUBY
+
+    pt = s(:case,
+           s(:lit, 0),
+           s(:in, s(:dot2, s(:lit, -1).line(2), s(:lit, 1).line(2)).line(2),
+             s(:true).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_044
+    rb = <<~RUBY
+      case obj
+      in Object[]
+        true
+      end
+    RUBY
+    pt = s(:case,
+           s(:call, nil, :obj),
+           s(:in, s(:array_pat, s(:const, :Object).line(2)).line(2),
+             s(:true).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_051
+    rb = <<~RUBY
+        case [0, 1, 2]
+        in [0, 1,]
+          true
+        end
+      RUBY
+    pt = s(:case,
+           s(:array,
+             s(:lit, 0),
+             s(:lit, 1),
+             s(:lit, 2)),
+           s(:in,
+             s(:array_pat,
+               nil,
+               s(:lit, 0).line(2),
+               s(:lit, 1).line(2),
+               :*).line(666),
+             s(:true).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_058
+    rb = <<~RUBY
+        case {a: 0}
+        in {a:, **rest}
+          [a, rest]
+        end
+      RUBY
+    pt = s(:case,
+           s(:hash,
+             s(:lit, :a),
+             s(:lit, 0)),
+           s(:in,
+             s(:hash_pat, nil, s(:lit, :a).line(2), nil,
+               s(:kwrest, :"**rest").line(2)).line(2),
+             s(:array,
+               s(:lvar, :a).line(3),
+               s(:lvar, :rest).line(3)).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_058_2
+    rb = <<~RUBY
+        case {a: 0}
+        in {a:, **}
+          [a]
+        end
+      RUBY
+    pt = s(:case,
+           s(:hash,
+             s(:lit, :a),
+             s(:lit, 0)),
+           s(:in,
+             s(:hash_pat, nil, s(:lit, :a).line(2), nil,
+               s(:kwrest, :"**").line(2)).line(2),
+             s(:array,
+               s(:lvar, :a).line(3)).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_069
+    rb = <<~RUBY
+        case :a
+        in Object[b: 1]
+          1
+        end
+      RUBY
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:hash_pat, s(:const, :Object).line(2),
+               s(:lit, :b).line(2), s(:lit, 1).line(2)).line(2),
+             s(:lit, 1).line(3)).line(2),
+           nil)
+
+
+    assert_parse rb, pt
+  end
+
+  def test_parse_pattern_076
+    rb = <<~RUBY
+        case {a: 1}
+        in {a: 1, **nil}
+          true
+        end
+      RUBY
+    pt = s(:case,
+           s(:hash, s(:lit, :a), s(:lit, 1)),
+           s(:in,
+             s(:hash_pat, nil,
+               s(:lit, :a).line(2), s(:lit, 1).line(2),
+               s(:kwrest, :"**nil").line(2)).line(2),
+             s(:true).line(3)).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  # def test_case_in_TEMPLATE
+  #   rb = "case :a\nin XXX then\n  YYY\nend\n"
+  #   pt = s(:case, s(:lit, :a),
+  #          s(:in,
+  #            ZZZ,
+  #            WWW).line(2),
+  #          nil)
+  #
+  #   assert_parse rb, pt
+  # end
+end
+
+module TestPatternMatching30
+  def test_case_in_20
+    assert_case_in("Symbol(*lhs, x, *rhs)",
+                   s(:find_pat,
+                     s(:const, :Symbol).line(2),
+                     :"*lhs",
+                     s(:lasgn, :x).line(2),
+                     :"*rhs").line(2))
+  end
+
+  def test_case_in_22
+    assert_case_in("Symbol[*lhs, x, *rhs]",
+                   s(:find_pat, s(:const, :Symbol).line(2),
+                     :"*lhs",
+                     s(:lasgn, :x).line(2),
+                     :"*rhs").line(2))
+  end
+end
+
 module TestRubyParserShared27Plus
   include TestRubyParserShared26Plus
+  include TestPatternMatching
+
+  def test_block_args_kwargs
+    rb = "f { |**kwargs| kwargs }"
+    pt = s(:iter,
+           s(:call, nil, :f),
+           s(:args, :"**kwargs"),
+           s(:lvar, :kwargs))
+
+    assert_parse rb, pt
+  end
+
+  def test_block_args_no_kwargs
+    rb = "f { |**nil| }"
+    pt = s(:iter,
+           s(:call, nil, :f),
+           s(:args, :"**nil"))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_forward_args
+    rb = "def a(...); b(...); end"
+    pt = s(:defn, :a, s(:args, s(:forward_args)),
+          s(:call, nil, :b, s(:forward_args)))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_arg_forward_args
+    rb = "def a(x, ...); b(x, ...); end"
+    pt = s(:defn, :a, s(:args, :x, s(:forward_args)),
+           s(:call, nil, :b, s(:lvar, :x), s(:forward_args)))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_args_forward_args
+    rb = "def a(x, y, z, ...); b(:get, z, ...); end"
+    pt = s(:defn, :a, s(:args, :x, :y, :z, s(:forward_args)),
+           s(:call, nil, :b, s(:lit, :get), s(:lvar, :z),
+             s(:forward_args)))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_no_kwargs
+    # def x(**nil)
+    # end
+    #
+    # def y(**kw)
+    # end
+    #
+    # def z()
+    # end
+    #
+    # x arg: 42 # $!: no keywords accepted (ArgumentError)
+    # y arg: 42 # fine
+    # z arg: 42 # $!: wrong number of arguments (given 1, expected 0) (ArgumentError)
+
+    rb = "def x(**nil); end"
+    pt = s(:defn, :x, s(:args, :"**nil"),
+           s(:nil))
+
+    assert_parse rb, pt
+  end
+
+  def test_call_forward_args_outside_method_definition
+    rb = "b(...)"
+
+    assert_syntax_error rb, "Unexpected ..."
+  end
+
+  def test_call_arg_forward_args_outside_method_definition
+    rb = "b(x, ...)"
+
+    assert_syntax_error rb, "Unexpected ..."
+  end
+
+  def test_mlhs_rescue
+    # same:
+    # a = (24 rescue 42)
+    # a = 24 rescue 42
+
+    # same:
+    # a, b = (f rescue 42)
+    # a, b = f rescue 42
+
+    rb = "a, b = f rescue 42"
+    pt = s(:masgn,
+           s(:array, s(:lasgn, :a), s(:lasgn, :b)),
+           s(:to_ary,
+             s(:rescue,
+               s(:call, nil, :f),
+               s(:resbody, s(:array),
+                 s(:lit, 42)))))
+
+    assert_parse rb, pt
+  end
 end
 
+module TestRubyParserShared30Plus
+  include TestRubyParserShared27Plus
+  include TestPatternMatching30
+
+  def test_rhs_asgn
+    rb = "42 => n"
+    pt = s(:case,
+           s(:lit, 42),
+           s(:in, s(:lasgn, :n), nil), nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_find
+    rb = "case :a\n  in *a, :+, *b\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:find_pat, nil,
+               :"*a",
+               s(:lit, :+).line(2),
+               :"*b").line(2),
+             nil).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_find_array
+    rb = "case :a\nin [*, :b, c, *]\nend"
+    pt = s(:case,
+           s(:lit, :a),
+           s(:in,
+             s(:find_pat, nil,
+               :*,
+               s(:lit, :b).line(2), s(:lasgn, :c).line(2),
+               :*).line(2),
+             nil).line(2),
+           nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_oneliner
+    rb = "def exec(cmd) = system(cmd)"
+    pt = s(:defn, :exec, s(:args, :cmd),
+           s(:call, nil, :system, s(:lvar, :cmd)))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_oneliner_noargs_parentheses
+    rb = "def exec() = system"
+    pt = s(:defn, :exec, s(:args),
+            s(:call, nil, :system))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_oneliner_noargs
+    rb = "def exec = system"
+    pt = s(:defn, :exec, s(:args),
+            s(:call, nil, :system))
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_oneliner_rescue
+    rb = "def exec(cmd)\n  system(cmd)\nrescue\n  nil\nend\n"
+    pt = s(:defn, :exec, s(:args, :cmd),
+           s(:rescue,
+             s(:call, nil, :system, s(:lvar, :cmd).line(2)).line(2),
+             s(:resbody, s(:array).line(3),
+               s(:nil).line(4)).line(3)).line(2))
+
+    assert_parse rb, pt
+
+    rb = "def exec(cmd)\n  system(cmd) rescue nil\nend\n"
+    assert_parse rb, pt.deep_each { |s| s.line = 2 if s.line && s.line > 1 }
+
+    rb = "def exec(cmd) = system(cmd) rescue nil"
+    assert_parse rb, pt.deep_each { |s| s.line = 1 }
+  end
+
+  def test_defn_oneliner_comment
+    p = RubyParser.new
+    rb = "# blah\ndef exec(cmd) = system(cmd)"
+    sexp = p.parse rb
+
+    assert_equal :defn, sexp.sexp_type
+    assert_equal "# blah\n", sexp.comments
+  end
+
+  def test_defs_oneliner
+    rb = "def self.exec(cmd) = system(cmd)"
+    pt = s(:defs, s(:self), :exec, s(:args, :cmd),
+           s(:call, nil, :system, s(:lvar, :cmd)))
+
+    assert_parse rb, pt
+  end
+
+  def test_defs_oneliner_rescue
+    rb = "def self.exec(cmd)\n  system(cmd)\nrescue\n  nil\nend\n"
+    pt = s(:defs, s(:self), :exec, s(:args, :cmd),
+           s(:rescue,
+             s(:call, nil, :system, s(:lvar, :cmd).line(2)).line(2),
+            s(:resbody, s(:array).line(3), s(:nil).line(4)).line(3)).line(2))
+    assert_parse rb, pt
+
+    rb = "def self.exec(cmd)\n  system(cmd) rescue nil\nend\n"
+    assert_parse rb, pt.deep_each { |s| s.line = 2 if s.line && s.line > 1 }
+
+    rb = "def self.exec(cmd) = system(cmd) rescue nil"
+    assert_parse rb, pt.deep_each { |s| s.line = 1 }
+  end
+
+  def test_defs_oneliner_comment
+    p = RubyParser.new
+    rb = "# blah\ndef self.exec(cmd) = system(cmd)"
+    sexp = p.parse rb
+
+    assert_equal :defs, sexp.sexp_type
+    assert_equal "# blah\n", sexp.comments
+  end
+
+  def test_defn_oneliner_setter
+    rb = "class X\n  def x=(o) = 42\nend"
+
+    assert_syntax_error rb, /setter method cannot be defined/
+
+    rb = "class X\n  def []=(k, v) = 42\nend"
+
+    assert_syntax_error rb, /setter method cannot be defined/
+  end
+
+  def test_defs_oneliner_setter
+    rb = "class X\n  def self.x=(o) = 42\nend"
+
+    assert_syntax_error rb, /setter method cannot be defined/
+
+    rb = "class X\n  def self.[]=(k, v) = 42\nend"
+
+    assert_syntax_error rb, /setter method cannot be defined/
+  end
+
+  def test_defn_oneliner_eq2
+    rb = "class X\n  def ==(o) = 42\nend"
+    pt = s(:class, :X, nil,
+           s(:defn, :==, s(:args, :o).line(2),
+             s(:lit, 42).line(2)).line(2)
+          ).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_defs_oneliner_eq2
+    rb = "class X\n  def self.==(o) = 42\nend"
+    pt = s(:class, :X, nil,
+           s(:defs, s(:self).line(2), :==, s(:args, :o).line(2),
+             s(:lit, 42).line(2)).line(2)
+          ).line(1)
+
+    assert_parse rb, pt
+  end
+end
+
+module TestRubyParserShared31Plus
+  include TestRubyParserShared30Plus
+
+  def test_assoc__bare
+    rb = "{ y: }"
+    pt = s(:hash, s(:lit, :y), nil)
+
+    assert_parse rb, pt
+  end
+
+  def test_block_arg__bare
+    rb = "def x(&); end"
+    pt = s(:defn, :x, s(:args, :&).line(1),
+           s(:nil).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_case_in_carat_parens
+    processor.env[:a] = :lvar
+
+    rb = "[^(a)]"
+    pt = s(:array_pat, nil,
+           s(:lvar, :a).line(2)).line(2)
+
+    assert_case_in rb, pt
+  end
+
+  def test_case_in_carat_nonlocal_vars
+    processor.env[:a] = :lvar
+
+    rb = "[^@a, ^$b, ^@@c]"
+    pt = s(:array_pat,
+           nil,
+           s(:ivar, :@a).line(2),
+           s(:gvar, :$b).line(2),
+           s(:cvar, :@@c).line(2)).line(2)
+
+    assert_case_in rb, pt
+  end
+
+  def test_case_in_quoted_label
+    rb = " \"b\": "
+    pt = s(:hash_pat, nil, s(:lit, :b).line(2), nil).line(2)
+
+    assert_case_in rb, pt
+  end
+
+  def test_call_block_arg_named
+    processor.env[:blk] = :lvar
+    rb = "x(&blk)"
+    pt = s(:call, nil, :x,
+           s(:block_pass, s(:lvar, :blk).line(1)).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_call_block_arg_unnamed
+    rb = "x(&)"
+    pt = s(:call, nil, :x,
+           s(:block_pass).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_endless_command
+    rb = "def some_method = other_method 42"
+    pt = s(:defn, :some_method, s(:args).line(1),
+           s(:call, nil, :other_method, s(:lit, 42).line(1)).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_defn_endless_command_rescue
+    rb = "def some_method = other_method 42 rescue 24"
+    pt = s(:defn, :some_method, s(:args).line(1),
+           s(:rescue,
+             s(:call, nil, :other_method, s(:lit, 42).line(1)).line(1),
+             s(:resbody, s(:array).line(1),
+               s(:lit, 24).line(1)).line(1)).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_defs_endless_command
+    rb = "def x.some_method = other_method 42"
+    pt = s(:defs, s(:call, nil, :x).line(1), :some_method, s(:args).line(1),
+           s(:call, nil, :other_method, s(:lit, 42).line(1)).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+
+  def test_defs_endless_command_rescue
+    rb = "def x.some_method = other_method 42 rescue 24"
+    pt = s(:defs, s(:call, nil, :x).line(1), :some_method, s(:args).line(1),
+           s(:rescue,
+             s(:call, nil, :other_method, s(:lit, 42).line(1)).line(1),
+             s(:resbody, s(:array).line(1),
+               s(:lit, 24).line(1)).line(1)).line(1)).line(1)
+
+    assert_parse rb, pt
+  end
+end
+
+class Minitest::Test
+  def skip s = "blah"
+    warn "ignoring skip for %s: %s" % [name, s]
+  end
+end if ENV["NOSKIP"]
+
 class TestRubyParser < Minitest::Test
   def test_cls_version
     assert_equal 23, RubyParser::V23.version
@@ -4159,7 +5507,7 @@ class TestRubyParser < Minitest::Test
       end
     end
 
-    assert_includes e.message, 'parse error on value false ($end)'
+    assert_includes e.message, 'parse error on value "$" ($end)'
   end
 
   def test_parse_error_from_first
@@ -4172,7 +5520,7 @@ class TestRubyParser < Minitest::Test
     end
 
     # This is a 2.x error, will fail on 1.8/1.9.
-    assert_includes e.message, 'parse error on value false ($end)'
+    assert_includes e.message, 'parse error on value "$" ($end)'
   end
 end
 
@@ -4194,8 +5542,24 @@ class RubyParserTestCase < ParseTreeTestCase
     super
   end
 
+  attr_accessor :assert_parse_ran
+
+  require "ruby2ruby" if ENV["R2R"]
+
   def assert_parse rb, pt
-    self.result = processor.parse rb
+    self.processor.reset if assert_parse_ran # allows multiple calls
+    self.assert_parse_ran = true
+
+    timeout = (ENV["RP_TIMEOUT"] || 10).to_i
+
+    pt.deep_each { |s| s.line ||= 1 }
+    pt.line ||= 1
+
+    self.result = processor.parse rb, "(string)", timeout
+
+    # just try it for now:
+    Ruby2Ruby.new.process(result.deep_clone) if ENV["R2R"]
+
     assert_equal pt, result
   end
 
@@ -4214,25 +5578,20 @@ class RubyParserTestCase < ParseTreeTestCase
     end
   end
 
-  def assert_parse_line rb, pt, line
-    old_env = ENV["VERBOSE"]
-    ENV["VERBOSE"] = "1"
-
-    assert_parse rb, pt
-    assert_equal line, result.line,   "call should have line number"
-  ensure
-    ENV["VERBOSE"] = old_env
-  end
-
-  def assert_syntax_error rb, emsg
+  def assert_syntax_error rb, emsg, klass = RubyParser::SyntaxError
     e = nil
     assert_silent do
-      e = assert_raises RubyParser::SyntaxError do
+      e = assert_raises klass do
         processor.parse rb
       end
     end
 
-    assert_equal emsg, e.message
+    case emsg
+    when String
+      assert_equal emsg, e.message
+    else
+      assert_match emsg, e.message
+    end
   end
 
   def refute_parse rb
@@ -4249,17 +5608,6 @@ class TestRubyParserV20 < RubyParserTestCase
 
     self.processor = RubyParser::V20.new
   end
-
-  def test_bug162__20
-    skip "not ready for this yet"
-
-    # Ignore everything after \r in heredoc marker in <= 2.0 #162
-
-    rb = %q(<<E\nfoo\nE\rO)
-    pt = s(:str, "foo\n")
-
-    assert_parse rb, pt
-  end
 end
 
 class TestRubyParserV21 < RubyParserTestCase
@@ -4318,7 +5666,7 @@ class TestRubyParserV24 < RubyParserTestCase
 
     assert_parse rb, pt
 
-    assert_parse_error "a(b rescue c)", /parse error on value ..rescue/
+    assert_parse_error "a(b rescue c)", /parse error on value .rescue/
   end
 end
 
@@ -4335,11 +5683,10 @@ class TestRubyParserV25 < RubyParserTestCase
     rb = "proc do\n  :begin\nensure\n  :ensure\nend.call"
     pt = s(:call,
            s(:iter,
-             s(:call, nil, :proc),
-             0,
+             s(:call, nil, :proc), 0,
              s(:ensure,
-               s(:lit, :begin),
-               s(:lit, :ensure))),
+               s(:lit, :begin).line(2),
+               s(:lit, :ensure).line(4)).line(2)),
            :call)
 
     assert_parse rb, pt
@@ -4348,16 +5695,14 @@ class TestRubyParserV25 < RubyParserTestCase
   def test_rescue_do_end_no_raise
     rb = "tap do\n  :begin\nrescue\n  :rescue\nelse\n  :else\nensure\n  :ensure\nend"
     pt = s(:iter,
-           s(:call, nil, :tap),
-           0,
+           s(:call, nil, :tap), 0,
            s(:ensure,
              s(:rescue,
-               s(:lit, :begin),
-               s(:resbody,
-                 s(:array),
-                 s(:lit, :rescue)),
-               s(:lit, :else)),
-             s(:lit, :ensure)))
+               s(:lit, :begin).line(2),
+               s(:resbody, s(:array).line(3),
+                 s(:lit, :rescue).line(4)).line(3),
+               s(:lit, :else).line(6)).line(2),
+             s(:lit, :ensure).line(8)).line(2))
 
     assert_parse rb, pt
   end
@@ -4365,11 +5710,10 @@ class TestRubyParserV25 < RubyParserTestCase
   def test_rescue_do_end_raised
     rb = "tap do\n  raise\nensure\n  :ensure\nend"
     pt = s(:iter,
-           s(:call, nil, :tap),
-           0,
+           s(:call, nil, :tap), 0,
            s(:ensure,
-             s(:call, nil, :raise),
-             s(:lit, :ensure)))
+             s(:call, nil, :raise).line(2),
+             s(:lit, :ensure).line(4)).line(2))
 
     assert_parse rb, pt
   end
@@ -4381,12 +5725,12 @@ class TestRubyParserV25 < RubyParserTestCase
            0,
            s(:ensure,
              s(:rescue,
-               s(:call, nil, :raise),
+               s(:call, nil, :raise).line(2),
                s(:resbody,
-                 s(:array),
-                 s(:lit, :rescue)),
-               s(:lit, :else)),
-             s(:lit, :ensure)))
+                 s(:array).line(3),
+                 s(:lit, :rescue).line(4)).line(3),
+               s(:lit, :else).line(6)).line(2),
+             s(:lit, :ensure).line(8)).line(2))
 
     assert_parse rb, pt
   end
@@ -4394,9 +5738,11 @@ class TestRubyParserV25 < RubyParserTestCase
   def test_rescue_in_block
     rb = "blah do\nrescue\n  stuff\nend"
     pt = s(:iter,
-           s(:call, nil, :blah),
-           0,
-           s(:rescue, s(:resbody, s(:array), s(:call, nil, :stuff))))
+           s(:call, nil, :blah), 0,
+           s(:rescue,
+             s(:resbody, s(:array).line(2),
+               s(:call, nil, :stuff).line(3)).line(2)).line(2))
+
     assert_parse rb, pt
   end
 end
@@ -4413,26 +5759,27 @@ class TestRubyParserV26 < RubyParserTestCase
   def test_parse_line_dot2_open
     rb = "0..\n; a..\n; c"
     pt = s(:block,
-           s(:dot2, s(:lit, 0).line(1), nil).line(1),
+           s(:dot2, s(:lit, 0), nil),
            s(:dot2, s(:call, nil, :a).line(2), nil).line(2),
-           s(:call, nil, :c).line(3)).line(1)
+           s(:call, nil, :c).line(3))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
 
   def test_parse_line_dot3_open
     rb = "0...\n; a...\n; c"
     pt = s(:block,
-           s(:dot3, s(:lit, 0).line(1), nil).line(1),
+           s(:dot3, s(:lit, 0), nil),
            s(:dot3, s(:call, nil, :a).line(2), nil).line(2),
-           s(:call, nil, :c).line(3)).line(1)
+           s(:call, nil, :c).line(3))
 
-    assert_parse_line rb, pt, 1
+    assert_parse rb, pt
   end
-
 end
 
 class TestRubyParserV27 < RubyParserTestCase
+  make_my_diffs_pretty!
+
   include TestRubyParserShared27Plus
 
   def setup
@@ -4440,8 +5787,47 @@ class TestRubyParserV27 < RubyParserTestCase
 
     self.processor = RubyParser::V27.new
   end
+
+  def test_bdot2
+    rb = "..10\n; ..a\n; c"
+    pt = s(:block,
+           s(:dot2, nil, s(:lit, 10)),
+           s(:dot2, nil, s(:call, nil, :a).line(2)).line(2),
+           s(:call, nil, :c).line(3))
+
+    assert_parse rb, pt
+  end
+
+  def test_bdot3
+    rb = "...10\n; ...a\n; c"
+    pt = s(:block,
+           s(:dot3, nil, s(:lit, 10)),
+           s(:dot3, nil, s(:call, nil, :a).line(2)).line(2),
+           s(:call, nil, :c).line(3))
+
+    assert_parse rb, pt
+  end
 end
 
+class TestRubyParserV30 < RubyParserTestCase
+  include TestRubyParserShared30Plus
+
+  def setup
+    super
+
+    self.processor = RubyParser::V30.new
+  end
+end
+
+class TestRubyParserV31 < RubyParserTestCase
+  include TestRubyParserShared31Plus
+
+  def setup
+    super
+
+    self.processor = RubyParser::V31.new
+  end
+end
 
 RubyParser::VERSIONS.each do |klass|
   v = klass.version