ruby_parser 3.20.0 → 3.20.3

data/test/test_ruby_parser.rb

@@ -15,11 +15,26 @@ class Sexp
   def == other # :nodoc:
     if other.class == self.class then
       super and
-        (line.nil? or other.line.nil? or line == other.line)
+        (line.nil?     or other.line.nil?     or line == other.line) and
+        (!defined?(@line_max) or @line_max.nil? or line_max == other.line_max)
+        # (line_max.nil? or other.line_max.nil? or line_max == other.line_max)
     else
       false
     end
   end
+
+  # convenience function just for testing
+  alias dead line_max
+  def line_max n = UNASSIGNED
+    if n != UNASSIGNED then
+      raise ArgumentError, "setting %p.line_max %p" % [self, n] unless Integer === n
+      @line_max = n
+      self
+    else
+      # raise "Accessing before @line_max defined" unless defined?(@line_max)
+      @line_max ||= self.deep_each.map(&:line).compact.max
+    end
+  end
 end
 
 module TestRubyParserShared
@@ -117,11 +132,13 @@ module TestRubyParserShared
     # for the array. Luckily, the arary elements all seemt to get the correct
     # line number.
     rb = "[\n'a',\n'b']\n1"
+
     pt = s(:block,
            s(:array,
              s(:str, "a").line(2),
-             s(:str, "b").line(3)),
+             s(:str, "b").line(3)).line(1),
            s(:lit, 1).line(4)).line 1
+
     assert_parse rb, pt
   end
 
@@ -965,7 +982,12 @@ module TestRubyParserShared
   end
 
   def test_heredoc_with_extra_carriage_horrible_mix?
-    rb = "<<'eot'\r\nbody\r\neot\n"
+    rb = <<~RUBY
+      <<'eot'\r
+      body\r
+      eot
+    RUBY
+
     pt = s(:str, "body\r\n")
 
     assert_parse rb, pt
@@ -1051,9 +1073,9 @@ module TestRubyParserShared
   end
 
   def test_i_fucking_hate_line_numbers2
-    rb = <<-EOM.gsub(/^ {6}/, "")
+    rb = <<~EOM
       if true then
-        p('a')
+        p("a")
         b = 1
         p b
         c =1
@@ -1074,6 +1096,138 @@ module TestRubyParserShared
     assert_parse rb, pt
   end
 
+  line_max_array = s(:array,
+                     s(:lit, :line2).line(2),
+                     s(:lit, :line3).line(3)).line(1).line_max(4)
+  line_max_array_empty = s(:array).line(1).line_max(4)
+  [
+    [:plain_array,
+     "[\n:line2,\n:line3\n]",
+     line_max_array,
+    ],
+    [:pct_i,
+     "%i[\nline2\nline3\n]",
+     line_max_array,
+    ],
+    [:pct_i_empty,
+     "%i[\n\n\n]",
+     line_max_array_empty,
+    ],
+    [:pct_I,
+     "%I[\nline2\nline3\n]",
+     line_max_array,
+    ],
+    [:pct_I_empty,
+     "%I[\n\n\n]",
+     line_max_array_empty,
+    ],
+    [:call_parens,
+     "x(\n:line2,\n:line3\n)",
+     s(:call, nil, :x, *line_max_array.sexp_body).line(1).line_max(4),
+    ],
+    [:pct_w,
+     "%w[\nline2\nline3\n]",
+     s(:array,
+       s(:str, "line2").line(2),
+       s(:str, "line3").line(3)).line(1).line_max(4),
+    ],
+    [:pct_w_empty,
+     "%w[\n\n\n]",
+     line_max_array_empty,
+    ],
+    [:pct_W,
+     "%W[\nline2\nline3\n]",
+     s(:array,
+       s(:str, "line2").line(2),
+       s(:str, "line3").line(3)).line(1).line_max(4),
+    ],
+    [:pct_W_empty,
+     "%W[\n\n\n]",
+     line_max_array_empty,
+    ],
+    [:regexp,
+     "%r[\n\n\n]", # double-quotes to have the \n counted as lines on input
+     s(:lit, %r[#{"\n\n\n"}]).line(1).line_max(4),
+    ],
+    [:module,
+     <<~"RUBY",
+       module X   # line 1
+         module Y # line 2
+           Z = 42 # line 3
+         end      # line 4
+       end        # line 5
+     RUBY
+     s(:module, :X,
+       s(:module, :Y,
+         s(:cdecl, :Z, s(:lit, 42).line(3)).line(3).line_max(3)
+        ).line(2).line_max(4)
+      ).line(1).line_max(5)],
+    [:class,
+     <<~"RUBY",
+       class X    # line 1
+         class Y  # line 2
+           Z = 42 # line 3
+         end      # line 4
+       end        # line 5
+     RUBY
+     s(:class, :X, nil,
+       s(:class, :Y, nil,
+         s(:cdecl, :Z, s(:lit, 42).line(3)).line(3).line_max(3)
+        ).line(2).line_max(4)
+      ).line(1).line_max(5)],
+    [:cdecl,
+     <<~"RUBY",
+       module X
+         X = [
+           :line3,
+           :line4,
+         ]
+       end
+     RUBY
+     s(:module, :X,
+       s(:cdecl, :X,
+         s(:array,
+           s(:lit, :line3).line(3),
+           s(:lit, :line4).line(4)).line(2).line_max(5),
+        ).line(2).line_max(5),
+      ).line(1).line_max(6)
+    ],
+    [:defn,
+     <<~"RUBY",
+       class X    # line 1
+         def y(a, # line 2
+               b) # line 3
+           a + b  # line 4
+         end      # line 5
+       end        # line 6
+     RUBY
+     s(:class, :X, nil,
+       s(:defn, :y, s(:args, :a, :b).line(2).line_max(3),
+         s(:call, s(:lvar, :a).line(4), :+, s(:lvar, :b).line(4)).line(4)
+        ).line(2).line_max(5),
+      ).line(1).line_max(6),
+    ],
+    [:defs,
+     <<~"RUBY",
+       class X         # line 1
+         def self.y(a, # line 2
+               b)      # line 3
+           a + b       # line 4
+         end           # line 5
+       end             # line 6
+     RUBY
+     s(:class, :X, nil,
+       s(:defs, s(:self).line(2), :y, s(:args, :a, :b).line(2).line_max(3),
+         s(:call, s(:lvar, :a).line(4), :+, s(:lvar, :b).line(4)).line(4)
+        ).line(2).line_max(5),
+      ).line(1).line_max(6),
+    ],
+  ].each do |(name, rb, pt)|
+    define_method "test_line_numbers__max_line__#{name}" do
+      assert_parse rb, pt
+    end
+  end
+
   def test_if_elsif
     rb = "if 1; elsif 2; end"
     pt = s(:if, s(:lit, 1), nil, s(:if, s(:lit, 2), nil, nil))
@@ -5402,6 +5556,14 @@ module TestRubyParserShared31Plus
     assert_case_in rb, pt
   end
 
+  def test_defn_forward_args__no_parens
+    rb = "def f ...\n  m(...)\nend"
+    pt = s(:defn, :f, s(:args, s(:forward_args)),
+          s(:call, nil, :m, s(:forward_args).line(2)).line(2))
+
+    assert_parse rb, pt
+  end
+
   def test_case_in_carat_nonlocal_vars
     processor.env[:a] = :lvar
 
@@ -5480,6 +5642,34 @@ end
 
 module TestRubyParserShared32Plus
   include TestRubyParserShared31Plus
+
+  def test_args_star__anon_solo
+    rb = "f(*)"
+    pt = s(:call, nil, :f, s(:splat))
+
+    assert_parse rb, pt
+  end
+
+  def test_args_star__anon_trailing
+    rb = "f(x, *)"
+    pt = s(:call, nil, :f, s(:call, nil, :x), s(:splat))
+
+    assert_parse rb, pt
+  end
+
+  def test_args_dstar__anon_solo
+    rb = "f(**)"
+    pt = s(:call, nil, :f, s(:hash, s(:kwsplat))) # TODO double check this
+
+    assert_parse rb, pt
+  end
+
+  def test_args_dstar__anon_trailing
+    rb = "f(x, **)"
+    pt = s(:call, nil, :f, s(:call, nil, :x), s(:hash, s(:kwsplat))) # TODO double check this
+
+    assert_parse rb, pt
+  end
 end
 
 class Minitest::Test
@@ -5782,8 +5972,6 @@ class TestRubyParserV26 < RubyParserTestCase
 end
 
 class TestRubyParserV27 < RubyParserTestCase
-  make_my_diffs_pretty!
-
   include TestRubyParserShared27Plus
 
   def setup

data/tools/munge.rb

@@ -174,6 +174,10 @@ ARGF.each_line do |line|
     last_token = token
   when /^Reading a token: / then
     next # skip
+  when /^Reading a token$/ then # wtf?
+    next # skip
+  when /^(?:add_delayed_token|parser_dispatch)/ then # dunno what this is yet
+    next # skip
   when /^read\s+:(\w+)/ then # read    :tNL(tNL) nil
     token = munge $1
     next if last_token == token
@@ -212,7 +216,9 @@ ARGF.each_line do |line|
     reduce_line = nil
     stack.clear
   when /^reduce/ then # ruby_parser side
-    puts munge line.chomp
+    s = munge line.chomp
+    next if s =~ /reduce\s+(\w+) --> \1/
+    puts s
     puts
   when /^(\w+_stack)\.(\w+)/ then
     # TODO: make pretty, but still informative w/ line numbers etc
@@ -223,7 +229,7 @@ ARGF.each_line do |line|
     # puts line
     # TODO: make pretty, but still informative w/ line numbers etc
     puts line.gsub("true", "1").gsub("false", "0")
-  when /^lex_state: :?([\w|]+) -> :?([\w|]+)(?: (?:at|from) (.*))?/ then
+  when /^lex_state: :?([\w|()]+) -> :?([\w|]+)(?: (?:at|from) (.*))?/ then
     a, b, c = $1.upcase, $2.upcase, $3
     a.gsub!(/EXPR_/, "")
     b.gsub!(/EXPR_/, "")

data/tools/ripper.rb

@@ -21,18 +21,20 @@ end
 ARGV.each do |path|
   src = path == "-" ? $stdin.read : File.read(path)
 
-  sexp = if $b then
-           Ripper.sexp src
-         else
-           rip = MySexpBuilder.new src
-           rip.yydebug = $d
-           rip.parse
-
-           if rip.error? then
-             warn "skipping"
-             next
-           end
-         end
+  sexp = nil
+
+  if $b then
+    sexp = Ripper.sexp src
+  else
+    rip = MySexpBuilder.new src
+    rip.yydebug = $d
+    sexp = rip.parse
+
+    if rip.error? then
+      warn "skipping"
+      next
+    end
+  end
 
   puts "accept"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.20.0
+  version: 3.20.3
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
   nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2023-03-04 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which