ruby_parser 3.19.0 → 3.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8b4b78bfb538253820b4ff34d49ebf7a91f9722c0ecfb63e3dadb3067530cb
-  data.tar.gz: e8e6e9cc42513094304d79a10fb4802706b10cb147084683c5dd3315c2ecde9a
+  metadata.gz: 82ff82f1d9693451e0d2f740f5e7a9cbeaa31034bee66ffa61486bc0f930d60b
+  data.tar.gz: 15d8b71b9533534ffaa4184e50f0e5a795e4a7f190bf13a55858f59b17c1ed99
 SHA512:
-  metadata.gz: dd72b30995fbc5ad74f04dedc341572d03b73b962ddd2dd3ecd255c8d1babe1b4e190b780588b846f2c8b8942327ac4a50bda0e8401d02037299f9b16965e69b
-  data.tar.gz: 5793d0f9bf5e11f56db8eb5b53fd4b603664e72818b4bc43a3bfb61cf3c4a0c61f9ecee3757350a684271ae9e0c434782ef739ef0f075b3897fa338bcd2680c5
+  metadata.gz: 78332be9c05d511d05f1c47977c74390658fcc00fc412009dba172d0e53c0e698b8e28c4803c4969720f2d2d29ed3fc891be2a990618098ae0cf04d00ad28e9f
+  data.tar.gz: 72f7e1c089bc80662ea2eb8c8056d7bb3bf84ff27224c2d450ffde94abd2fb5ba2317d1405a880bebb2c91ac34bcb7023685065f1a8b2e69f62ed8f6b0362e77

data/History.rdoc

@@ -1,3 +1,20 @@
+=== 3.19.2 / 2022-12-03
+
+* 5 bug fixes:
+
+  * Fixed bug parsing array patterns using %w, %i, etc.
+  * Fixed dedenting when heredoc has only empty line and interpolation. (mvz)
+  * Fixed dsym unescaping. (mvz)
+  * Fixed vars in pattern matching that should be lasgn, not lvar.
+  * find_pat mid-patterns are now splatted inline, not wrapped in an array_pat.
+
+=== 3.19.1 / 2022-04-05
+
+* 2 bug fixes:
+
+  * Added comments to endless defn and defs. (mvz)
+  * Fixed endless method bug handling attrset names.
+
 === 3.19.0 / 2022-03-29
 
 * 1 major enhancement:

data/Rakefile

@@ -12,6 +12,7 @@ Hoe.add_include_dirs "lib"
 Hoe.add_include_dirs "../../sexp_processor/dev/lib"
 Hoe.add_include_dirs "../../minitest/dev/lib"
 Hoe.add_include_dirs "../../oedipus_lex/dev/lib"
+Hoe.add_include_dirs "../../ruby2ruby/dev/lib"
 
 V2   = %w[20 21 22 23 24 25 26 27]
 V3   = %w[30 31]

data/gauntlet.md

@@ -42,8 +42,7 @@ using `unpack_gems.rb`.
 ... waaaait ...
 % DIR=gauntlet.$(today).(all|new).noindex
 % mv hashed.noindex $DIR
-% tar c $DIR | zstd -5 -T0 --long > archives/$DIR.tar.zst
-% tar vc -T <(fd . $DIR | sort) | zstd -5 -T0 --long > archives/$DIR.tar.zst
+% tar vc -T <(fd -tf . $DIR | sort) | zstd -5 -T0 --long > archives/$DIR.tar.zst ; say done
 % ./bin/sync.sh
 ```
 
@@ -66,8 +65,8 @@ Unpacking, validating, SHA'ing everything is disk and CPU intensive.
 The `.noindex` extension stops spotlight from indexing the continous
 churn of files being unpacked and moved and saves time.
 
-Finally, I rename and archive it all up (currently using lrztar, but
-I'm not in love with it).
+Finally, I rename and archive it all up (currently using zstd to
+compress).
 
 ### Stats
 
@@ -75,7 +74,7 @@ I'm not in love with it).
 9696 % find gauntlet.$(today).noindex -type f | lc
   561270
 3.5G gauntlet.2021-08-06.noindex
-239M gauntlet.2021-08-06.noindex.tar.lrz
+239M gauntlet.2021-08-06.noindex.tar.zst
 ```
 
 So I wind up with a little over half a million unique ruby files to
@@ -86,7 +85,7 @@ parse. It's about 3.5g but compresses very nicely down to 240m
 Assuming you're starting from scratch, unpack the archive once:
 
 ```
-% lrzuntar gauntlet.$(today).noindex.lrz
+% zstdcat gauntlet.$(today).noindex.tar.zst | tar x
 ```
 
 Then, either run a single process (easier to read):
@@ -98,7 +97,7 @@ Then, either run a single process (easier to read):
 Or max out your machine using xargs (note the `-P 16` and choose accordingly):
 
 ```
-% ls -d gauntlet/*.noindex/?/? | xargs -n 1 -P 16 ./gauntlet/bin/gauntlet.rb
+% ls -d gauntlet/*.noindex/?/? | time xargs -n 1 -P 16 ./gauntlet/bin/gauntlet.rb
 ```
 
 In another terminal I usually monitor the progress like so:

data/lib/ruby27_parser.rb

@@ -7722,10 +7722,10 @@ racc_reduce_table = [
   1, 364, :_reduce_none,
   1, 364, :_reduce_none,
   1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
-  1, 364, :_reduce_none,
+  1, 364, :_reduce_548,
+  1, 364, :_reduce_549,
+  1, 364, :_reduce_550,
+  1, 364, :_reduce_551,
   1, 364, :_reduce_552,
   1, 364, :_reduce_none,
   1, 344, :_reduce_554,
@@ -11813,13 +11813,29 @@ end
 
 # reduce 547 omitted
 
-# reduce 548 omitted
+def _reduce_548(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
+
+def _reduce_549(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 549 omitted
+    result
+end
+
+def _reduce_550(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
 
-# reduce 550 omitted
+def _reduce_551(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 551 omitted
+    result
+end
 
 def _reduce_552(val, _values, result)
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -11835,7 +11851,7 @@ end
 def _reduce_554(val, _values, result)
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
 
     result
 end

data/lib/ruby27_parser.y

@@ -2453,9 +2453,21 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | xstring
                 | regexp
                 | words
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qwords
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | symbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qsymbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | keyword_variable
                     {
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -2469,7 +2481,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby30_parser.rb

@@ -7841,10 +7841,10 @@ racc_reduce_table = [
   1, 371, :_reduce_none,
   1, 371, :_reduce_none,
   1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
-  1, 371, :_reduce_none,
+  1, 371, :_reduce_561,
+  1, 371, :_reduce_562,
+  1, 371, :_reduce_563,
+  1, 371, :_reduce_564,
   1, 371, :_reduce_565,
   1, 371, :_reduce_none,
   1, 350, :_reduce_567,
@@ -12038,13 +12038,29 @@ end
 
 # reduce 560 omitted
 
-# reduce 561 omitted
+def _reduce_561(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
+
+def _reduce_562(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 562 omitted
+    result
+end
+
+def _reduce_563(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
 
-# reduce 563 omitted
+def _reduce_564(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 564 omitted
+    result
+end
 
 def _reduce_565(val, _values, result)
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -12060,7 +12076,7 @@ end
 def _reduce_567(val, _values, result)
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
 
     result
 end

data/lib/ruby30_parser.y

@@ -2534,9 +2534,21 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | xstring
                 | regexp
                 | words
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qwords
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | symbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qsymbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | keyword_variable
                     {
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -2550,7 +2562,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby31_parser.rb

@@ -8153,10 +8153,10 @@ racc_reduce_table = [
   1, 373, :_reduce_none,
   1, 373, :_reduce_none,
   1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
-  1, 373, :_reduce_none,
+  1, 373, :_reduce_569,
+  1, 373, :_reduce_570,
+  1, 373, :_reduce_571,
+  1, 373, :_reduce_572,
   1, 373, :_reduce_573,
   1, 373, :_reduce_none,
   1, 351, :_reduce_575,
@@ -12399,13 +12399,29 @@ end
 
 # reduce 568 omitted
 
-# reduce 569 omitted
+def _reduce_569(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
+
+def _reduce_570(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 570 omitted
+    result
+end
+
+def _reduce_571(val, _values, result)
+                      result = ary_to_pat val[0]
+
+    result
+end
 
-# reduce 571 omitted
+def _reduce_572(val, _values, result)
+                      result = ary_to_pat val[0]
 
-# reduce 572 omitted
+    result
+end
 
 def _reduce_573(val, _values, result)
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -12421,7 +12437,7 @@ end
 def _reduce_575(val, _values, result)
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
 
     result
 end

data/lib/ruby31_parser.y

@@ -2562,9 +2562,21 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | xstring
                 | regexp
                 | words
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qwords
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | symbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qsymbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | keyword_variable
                     {
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -2578,7 +2590,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby3_parser.yy

@@ -2591,9 +2591,21 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | xstring
                 | regexp
                 | words
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qwords
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | symbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qsymbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | keyword_variable
                     {
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -2607,7 +2619,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby_lexer.rb

@@ -232,7 +232,7 @@ class RubyLexer
     content = match[1]
 
     if text =~ check then
-      content.gsub(ESC) { unescape $1 }
+      unescape_string content
     else
       content.gsub(/\\\\/, "\\").gsub(/\\\'/, "'")
     end
@@ -590,9 +590,7 @@ class RubyLexer
     orig_line = lineno
     self.lineno += text.count("\n")
 
-    str = text[1..-2]
-      .gsub(ESC) { unescape($1).b.force_encoding Encoding::UTF_8 }
-    str = str.b unless str.valid_encoding?
+    str = unescape_string text[1..-2]
 
     result EXPR_END, :tSTRING, str, orig_line
   end
@@ -817,6 +815,15 @@ class RubyLexer
     end
   end
 
+  def unescape_string str
+    str = str.gsub(ESC) { unescape($1).b.force_encoding Encoding::UTF_8 }
+    if str.valid_encoding?
+      str
+    else
+      str.b
+    end
+  end
+
   def unescape s
     r = ESCAPES[s]
 

data/lib/ruby_parser.yy

@@ -2530,9 +2530,21 @@ opt_block_args_tail: tCOMMA block_args_tail
                 | xstring
                 | regexp
                 | words
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qwords
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | symbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | qsymbols
+                    {
+                      result = ary_to_pat val[0]
+                    }
                 | keyword_variable
                     {
                       # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
@@ -2546,7 +2558,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       # TODO: error_duplicate_pattern_variable(p, $1, &@1);
                       # TODO: assignable(p, $1, 0, &@$);
-                      result = wrap :lvar, val[0]
+                      result = wrap :lasgn, val[0]
                     }
 
        p_var_ref: tCARET tIDENTIFIER

data/lib/ruby_parser_extras.rb

@@ -30,7 +30,7 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.19.0"
+  VERSION = "3.19.2"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_accessor :in_kwarg
@@ -218,11 +218,15 @@ module RubyParserStuff
     self.args args
   end
 
+  def attrset_id? id
+    id =~ /^\[\]=$|^\w+=$/
+  end
+
   def endless_method_name defn_or_defs
     name = defn_or_defs[1]
     name = defn_or_defs[2] unless Symbol === name
 
-    if name.end_with? "=" then
+    if attrset_id? name then
       yyerror "setter method cannot be defined in an endless method definition"
     end
 
@@ -467,7 +471,7 @@ module RubyParserStuff
         end
       else
         warn "unprocessed: %p" % [s]
-      end.map { |l| whitespace_width l.chomp }
+      end.map { |l| whitespace_width l }
     }.compact.min
   end
 
@@ -727,6 +731,13 @@ module RubyParserStuff
     result
   end
 
+  def ary_to_pat ary
+    pat = ary.dup
+    pat.sexp_type = :array_TAIL
+
+    new_array_pattern nil, nil, pat, ary.line
+  end
+
   def new_array_pattern const, pre_arg, arypat, loc
     result = s(:array_pat, const).line loc
     result << pre_arg if pre_arg
@@ -994,6 +1005,8 @@ module RubyParserStuff
     local_pop in_def
     endless_method_name result
 
+    result.comments = self.comments.pop
+
     result
   end
 
@@ -1014,6 +1027,8 @@ module RubyParserStuff
     local_pop in_def
     endless_method_name result
 
+    result.comments = self.comments.pop
+
     result
   end
 
@@ -1058,9 +1073,9 @@ module RubyParserStuff
     lhs_id = "*#{lhs_id}".to_sym
     rhs_id = "*#{rhs_id}".to_sym
 
-    mid.sexp_type = :array_pat # HACK?
+    raise "BAD?" unless mid.sexp_type == :array_TAIL
 
-    s(:find_pat_TAIL, lhs_id, mid, rhs_id).line line
+    s(:find_pat_TAIL, lhs_id, *mid.sexp_body, rhs_id).line line
   end
 
   def new_for expr, var, body
@@ -1643,7 +1658,7 @@ module RubyParserStuff
 
     if remove_width then
       line[idx..-1]
-    elsif line[idx].nil?
+    elsif line[idx] == "\n"
       nil
     else
       col

data/test/test_ruby_lexer.rb

@@ -3009,6 +3009,19 @@ class TestRubyLexer < Minitest::Test
                 :tSTRING_END,     "\"",     EXPR_LIT)
   end
 
+  def test_yylex_symbol_double_escape_octal
+    setup_lexer ":\"Variet\\303\\240\""
+
+    adv = @lex.next_token
+    act_token, act_value = adv
+    act_value = act_value.first
+
+    assert_equal :tSYMBOL, act_token
+    assert_match EXPR_LIT, @lex.lex_state
+    # Force comparison of encodings
+    assert_equal "Varietà", act_value
+  end
+
   def test_yylex_symbol_single
     assert_lex3(":'symbol'",
                 nil,

data/test/test_ruby_parser.rb

@@ -826,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
@@ -3541,10 +3548,8 @@ module TestRubyParserShared20Plus
   end
 
   def test_regexp_esc_C_slash
-    skip "https://bugs.ruby-lang.org/issues/18449" if RUBY_VERSION == "3.1.0"
-
     rb = "/\\cC\\d/"
-    pt = s(:lit, /\cC\d/)
+    pt = s(:lit, Regexp.new('\cC\d')) # https://bugs.ruby-lang.org/issues/18449
 
     assert_parse rb, pt
   end
@@ -4270,6 +4275,21 @@ module TestRubyParserShared23Plus
     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)
@@ -4553,8 +4573,8 @@ module TestPatternMatching
     pt = s(:array_pat,
            nil,
            s(:lit, :a).line(2),
-           s(:lvar, :b).line(2),
-           s(:lvar, :c).line(2),
+           s(:lasgn, :b).line(2),
+           s(:lasgn, :c).line(2),
            s(:array_pat,
              nil,
              s(:lit, :d).line(2),
@@ -4647,19 +4667,19 @@ module TestPatternMatching
   end
 
   def test_case_in_78
-    assert_case_in "%W[a b]", s(:array, s(:str, "a").line(2), s(:str, "b").line(2)).line(2)
+    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, s(:str, "a").line(2), s(:str, "b").line(2)).line(2)
+    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, s(:lit, :a).line(2), s(:lit, :b).line(2)).line(2)
+    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, s(:lit, :a).line(2), s(:lit, :b).line(2)).line(2)
+    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
@@ -4667,7 +4687,7 @@ module TestPatternMatching
     pt = s(:array_pat, nil,
            s(:iter, s(:lambda).line(2), s(:args, :b).line(2),
              s(:true).line(2)).line(2),
-           s(:lvar, :c).line(2)).line(2)
+           s(:lasgn, :c).line(2)).line(2)
 
     assert_case_in rb, pt
   end
@@ -4677,7 +4697,7 @@ module TestPatternMatching
     pt = s(:array_pat, nil,
            s(:array_pat, nil,
              s(:lit, :b).line(2),
-             s(:lvar, :c).line(2)).line(2),
+             s(:lasgn, :c).line(2)).line(2),
            s(:array_pat,
              nil,
              s(:lit, :d).line(2),
@@ -4723,7 +4743,7 @@ module TestPatternMatching
            s(:in,
              s(:array_pat,
                s(:const, :B).line(2),
-               s(:lvar, :c).line(2)).line(2),
+               s(:lasgn, :c).line(2)).line(2),
              s(:lit, :d).line(3)).line(2),
            nil)
 
@@ -4736,7 +4756,7 @@ module TestPatternMatching
            s(:in,
              s(:array_pat,
                s(:const, s(:colon2, s(:const, :B).line(2), :C).line(2)).line(2),
-               s(:lvar, :d).line(2)).line(2),
+               s(:lasgn, :d).line(2)).line(2),
              s(:lit, :e).line(3)).line(2),
           nil)
 
@@ -4841,7 +4861,7 @@ module TestPatternMatching
              s(:hash_pat,
                nil,
                s(:lit, :b).line(2),
-               s(:lvar, :c).line(2),
+               s(:lasgn, :c).line(2),
                s(:kwrest, :"**rest").line(2)).line(2),
              s(:lit, :d).line(2)).line(2),
            nil)
@@ -4934,12 +4954,12 @@ module TestPatternMatching
   end
 
   def test_parse_pattern_044
-      rb = <<~RUBY
-        case obj
-        in Object[]
-          true
-        end
-      RUBY
+    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),
@@ -5072,7 +5092,7 @@ module TestPatternMatching30
                    s(:find_pat,
                      s(:const, :Symbol).line(2),
                      :"*lhs",
-                     s(:array_pat, s(:lvar, :x).line(2)).line(2),
+                     s(:lasgn, :x).line(2),
                      :"*rhs").line(2))
   end
 
@@ -5080,7 +5100,7 @@ module TestPatternMatching30
     assert_case_in("Symbol[*lhs, x, *rhs]",
                    s(:find_pat, s(:const, :Symbol).line(2),
                      :"*lhs",
-                     s(:array_pat, s(:lvar, :x).line(2)).line(2),
+                     s(:lasgn, :x).line(2),
                      :"*rhs").line(2))
   end
 end
@@ -5196,7 +5216,7 @@ module TestRubyParserShared30Plus
     rb = "42 => n"
     pt = s(:case,
            s(:lit, 42),
-           s(:in, s(:lvar, :n), nil), nil)
+           s(:in, s(:lasgn, :n), nil), nil)
 
     assert_parse rb, pt
   end
@@ -5208,7 +5228,7 @@ module TestRubyParserShared30Plus
            s(:in,
              s(:find_pat, nil,
                :"*a",
-               s(:array_pat, s(:lit, :+).line(2)).line(2),
+               s(:lit, :+).line(2),
                :"*b").line(2),
              nil).line(2),
            nil)
@@ -5223,7 +5243,7 @@ module TestRubyParserShared30Plus
            s(:in,
              s(:find_pat, nil,
                :*,
-               s(:array_pat, s(:lit, :b).line(2), s(:lvar, :c).line(2)).line(2),
+               s(:lit, :b).line(2), s(:lasgn, :c).line(2),
                :*).line(2),
              nil).line(2),
            nil)
@@ -5272,6 +5292,15 @@ module TestRubyParserShared30Plus
     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),
@@ -5295,17 +5324,54 @@ module TestRubyParserShared30Plus
     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= = 42\nend"
+    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
@@ -5478,6 +5544,8 @@ class RubyParserTestCase < ParseTreeTestCase
 
   attr_accessor :assert_parse_ran
 
+  require "ruby2ruby" if ENV["R2R"]
+
   def assert_parse rb, pt
     self.processor.reset if assert_parse_ran # allows multiple calls
     self.assert_parse_ran = true
@@ -5488,6 +5556,10 @@ class RubyParserTestCase < ParseTreeTestCase
     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
 

data.tar.gz.sig

@@ -1,6 +1 @@
-#���ө
-D+� Ps4��@VHXhoSv�|Ý[�=�����U�w�F�@Ju��%�GS=��@p�;
-��*A05Yx�&�q�	�.�QQ:a>�0mZ���� �w�j�b���sA���*b�d��?3��4��x�Qw!���
-e�
-��z*�������Pp��/���F~J{W:4
-�U�/ѯ5�,u	�#ɓ���-
+��4i�L[�.�M���4�D=�EuƜK���	�OegE�WKʱ�Dwc}����lٷ�3P�WV�g�L�_���7v�]{�ؚH>n|���2Y��ZxM@oGz'Yq!���+����oۢ���U�mY����WAQ��^��1�gJ�t�Z[wp�>o�v2�q�
h[��"��y/}l���j�߉�	]o�Qi/�[RԄ���b٢T��m^x{���9p�H�JjK.�eKz�B�ɹ�C6U8[$�L��9YV^��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.19.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
   YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -119,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
   racc--which does by default use a C extension). It outputs
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which