ruby_parser 3.20.1 → 3.20.3

data/lib/ruby_parser.yy

@@ -1293,7 +1293,6 @@ rule
                 | k_begin
                     {
                       lexer.cmdarg.push false
-                      result = self.lexer.lineno
                     }
                     bodystmt k_end
                     {
@@ -1458,9 +1457,6 @@ rule
                       result = new_for iter, var, body
                     }
                 | k_class
-                    {
-                      result = self.lexer.lineno
-                    }
                     cpath superclass
                     {
                       if (self.in_def || self.in_single > 0) then
@@ -1475,9 +1471,6 @@ rule
                       self.lexer.ignore_body_comments
                     }
                 | k_class tLSHFT
-                    {
-                      result = self.lexer.lineno
-                    }
                     expr
                     {
                       result = self.in_def
@@ -1496,9 +1489,6 @@ rule
                       self.lexer.ignore_body_comments
                     }
                 | k_module
-                    {
-                      result = self.lexer.lineno
-                    }
                     cpath
                     {
                       yyerror "module definition in method body" if

data/lib/ruby_parser_extras.rb

@@ -30,9 +30,9 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.20.1"
+  VERSION = "3.20.3"
 
-  attr_accessor :lexer, :in_def, :in_single, :file
+  attr_accessor :lexer, :in_def, :in_single, :file, :in_argdef
   attr_accessor :in_kwarg
   attr_reader :env, :comments
 
@@ -122,6 +122,7 @@ module RubyParserStuff
     self.lexer = RubyLexer.new v && v.to_i
     self.lexer.parser = self
     self.in_kwarg = false
+    self.in_argdef = false
 
     @env = RubyParserStuff::Environment.new
     @comments = []
@@ -824,10 +825,10 @@ module RubyParserStuff
   end
 
   def new_begin val
-    _, lineno, body, _ = val
+    (_, line), _, body, _ = val
 
     result = body ? s(:begin, body) : s(:nil)
-    result.line lineno
+    result.line line
 
     result
   end
@@ -928,8 +929,7 @@ module RubyParserStuff
   end
 
   def new_class val
-    # TODO: get line from class keyword
-    _, line, path, superclass, _, body, (_, line_max) = val
+    (_, line), path, superclass, _, body, (_, line_max) = val
 
     path = path.first if path.instance_of? Array
 
@@ -1209,7 +1209,7 @@ module RubyParserStuff
   end
 
   def new_module val
-    (_, line_min), _, path, _, body, (_, line_max) = val
+    (_, line_min), path, _, body, (_, line_max) = val
 
     path = path.first if path.instance_of? Array
 
@@ -1367,7 +1367,7 @@ module RubyParserStuff
   end
 
   def new_sclass val
-    recv, in_def, in_single, body = val[3], val[4], val[6], val[7]
+    (_, line), _, recv, in_def, _, in_single, body, _ = val
 
     result = s(:sclass, recv)
 
@@ -1379,7 +1379,7 @@ module RubyParserStuff
       end
     end
 
-    result.line = val[2]
+    result.line = line
     self.in_def = in_def
     self.in_single = in_single
     result

data/test/test_ruby_parser.rb

@@ -132,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
 
@@ -5554,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
 
@@ -5632,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

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.1
+  version: 3.20.3
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
   nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor