ruby_parser 3.20.2 → 3.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ecb31322a35ef752328921f895d350d220a56e7ed6fb36462742fefc7962f55
-  data.tar.gz: aac07b5fa420c5d9c86c8b32c9d0232f1760c16354a9765530a6a1a87a209cfa
+  metadata.gz: 6130eb28e9d379051c5b2f5c83b2c77ca217e82e0ca0aa53736128810fd1ff35
+  data.tar.gz: 7359cfb0974a66a0d07bb75899d92c2082a23e326bd6aed56ae5c7790e2819be
 SHA512:
-  metadata.gz: 51239eb0334a8fbc60f6e7a8011853a126f3c6db1889bc5204652a7f0d33791f7d704ed0334a5061deb08e4a82fd10a299565e71cc2861b6a869a718dd87057c
-  data.tar.gz: acfd8ce38fdbea35fbb89664e445deee0c2ab686e0fb5e4db3cc151f42ef6305c412939ce2e77a95e66d9bd2856e33d1098c0d12cb05eb99b82616bda5f444d2
+  metadata.gz: 0d9e8d398b4f7f412406c23ec13557d4c80f4c10fffbf9563992df2cbbda7c0c9ca46e933025c20930d7434336b63d6485d8cb5463e484e5a04c676d7207a8eb
+  data.tar.gz: a34f3b845c73d919b5e502d07f2683e823dd126372cac137eb7c4b504ad4b90f6a25f46f8eb30ef62cba55ef50b7eb3b148d426dcdeabeca87e3465b0622b548

data/History.rdoc

@@ -1,3 +1,47 @@
+=== 3.21.0 / 2024-01-15
+
+* 18 minor enhancements:
+
+  * (internal) Added simple RubyLexer#comment.
+  * (internal) Removed RubyLexer#comments and #ignore_body_comments.
+  * (internal) Removed RubyParser#comments.
+  * (internal) Renamed files from lib/ruby##_parser.* to lib/ruby_parser##.*
+  * (internal) Renamed lib/ruby3_parser.yy to lib/ruby_parser3.yy
+  * (internal) Renamed lib/ruby_parser.yy to lib/ruby_parser2.yy
+  * Added tentative 3.2 support. (torrocus)
+  * Made `rake compare` a multitask (28s -> 10s!!).
+  * Made `rake compare` depend on `generate` (from clean: 28s -> 18s).
+  * No longer package versioned .y files.
+  * Overhaul of parser/lexer comment processing.
+  * Parser productions for k_class/k_module/k_def carry their comment with them.
+  * Restructured build tasks to utilize Hoe's .yy support! 8.5s -> 1.2s!!!
+  * RubyParser new_(class|module|defn|defs) handle comment processing via sexp.
+  * RubyParser new_(class|module|defn|defs) handle normalizing production sexps.
+  * RubyParser#next_token clears out lexer's comment when applicable.
+  * Simplified parser productions for defn_head, defs_head. No more normalizing.
+  * Updated `rake compare` steps for lrama in ruby 3.3+.
+
+* 6 bug fixes:
+
+  * Cleaned out cruft from `rake compare` code.
+  * Fixed compare/normalize.rb for lrama differences.
+  * Made `parser` task depend on `isolate` task to pick up racc generator.
+  * Made racc a runtime dependency (was dev only) now that ruby 3.3 doesn't ship with the racc runtime. (wildmaples)
+  * Updated README.rdoc updating instructions to match current filenames.
+  * Updated compare versions and added 3.3.
+
+=== 3.20.3 / 2023-07-11
+
+* 2 minor enhancements:
+
+  * Added Parser#in_argdef and integrated into 3.x parsers.
+  * Improved tools/munge.rb to handler MRI 3.2 output
+
+* 2 bug fixes:
+
+  * Fixed process_dots to properly deal with paren-less forward_args. (eric1234)
+  * Fixed tools/ripper.rb to properly print ripper sexp at the end
+
 === 3.20.2 / 2023-06-06
 
 * 1 bug fix:

data/Manifest.txt

@@ -11,35 +11,25 @@ gauntlet.md
 lib/.document
 lib/rp_extensions.rb
 lib/rp_stringscanner.rb
-lib/ruby20_parser.rb
-lib/ruby20_parser.y
-lib/ruby21_parser.rb
-lib/ruby21_parser.y
-lib/ruby22_parser.rb
-lib/ruby22_parser.y
-lib/ruby23_parser.rb
-lib/ruby23_parser.y
-lib/ruby24_parser.rb
-lib/ruby24_parser.y
-lib/ruby25_parser.rb
-lib/ruby25_parser.y
-lib/ruby26_parser.rb
-lib/ruby26_parser.y
-lib/ruby27_parser.rb
-lib/ruby27_parser.y
-lib/ruby30_parser.rb
-lib/ruby30_parser.y
-lib/ruby31_parser.rb
-lib/ruby31_parser.y
-lib/ruby32_parser.rb
-lib/ruby32_parser.y
-lib/ruby3_parser.yy
 lib/ruby_lexer.rb
 lib/ruby_lexer.rex
 lib/ruby_lexer.rex.rb
 lib/ruby_lexer_strings.rb
 lib/ruby_parser.rb
-lib/ruby_parser.yy
+lib/ruby_parser2.yy
+lib/ruby_parser20.rb
+lib/ruby_parser21.rb
+lib/ruby_parser22.rb
+lib/ruby_parser23.rb
+lib/ruby_parser24.rb
+lib/ruby_parser25.rb
+lib/ruby_parser26.rb
+lib/ruby_parser27.rb
+lib/ruby_parser3.yy
+lib/ruby_parser30.rb
+lib/ruby_parser31.rb
+lib/ruby_parser32.rb
+lib/ruby_parser33.rb
 lib/ruby_parser_extras.rb
 test/test_ruby_lexer.rb
 test/test_ruby_parser.rb

data/README.rdoc

@@ -65,15 +65,15 @@ You can also use Ruby19Parser, Ruby18Parser, or RubyParser.for_current_ruby:
 
 To add a new version:
 
-* New parser should be generated from lib/ruby[3]_parser.yy.
-* Extend lib/ruby[3]_parser.yy with new class name.
+* New parser should be generated from lib/ruby_parser[23].yy.
+* Extend lib/ruby_parser[23].yy with new class name.
 * Add new version number to V2/V3 in Rakefile for rule creation.
 * Add new `ruby_parse "x.y.z"` line to Rakefile for rake compare (line ~300).
 * Require generated parser in lib/ruby_parser.rb.
 * Add new V## = ::Ruby##Parser; end to ruby_parser.rb (bottom of file).
 * Add empty TestRubyParserShared##Plus module and TestRubyParserV## to test/test_ruby_parser.rb.
 * Extend Manifest.txt with generated file names.
-* Add new version number to sexp_processor's pt_testcase.rb in all_versions
+* Add new version number to sexp_processor's pt_testcase.rb in all_versions.
 
 Until all of these are done, you won't have a clean test run.
 

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- ruby -*-
 
-require "rubygems"
 require "hoe"
 
 Hoe.plugin :seattlerb
@@ -15,38 +14,34 @@ 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 32]
+V3   = %w[30 31 32 33]
 
 VERS = V2 + V3
 
 ENV["FAST"] = VERS.last if ENV["FAST"] && !VERS.include?(ENV["FAST"])
 VERS.replace [ENV["FAST"]] if ENV["FAST"]
 
+racc_flags = nil
+
 Hoe.spec "ruby_parser" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
 
   license "MIT"
 
-  dependency "sexp_processor", "~> 4.16"
-  dependency "rake", [">= 10", "< 15"], :developer
-  dependency "oedipus_lex", "~> 2.6", :developer
-
-  # NOTE: Ryan!!! Stop trying to fix this dependency! Isolate just
-  # can't handle having a faux-gem half-installed! Stop! Just `gem
-  # install racc` and move on. Revisit this ONLY once racc-compiler
-  # gets split out.
-
-  dependency "racc", "~> 1.5", :developer
+  dependency "sexp_processor", "~>  4.16"
+  dependency "racc",           "~>  1.5"
+  dependency "rake",           [">= 10",  "< 15"], :developer
+  dependency "oedipus_lex",    "~>  2.6", :developer
 
   require_ruby_version [">= 2.6", "< 4"]
 
   if plugin? :perforce then     # generated files
     VERS.each do |n|
-      self.perforce_ignore << "lib/ruby#{n}_parser.rb"
+      self.perforce_ignore << "lib/ruby_parser#{n}.rb"
     end
 
     VERS.each do |n|
-      self.perforce_ignore << "lib/ruby#{n}_parser.y"
+      self.perforce_ignore << "lib/ruby_parser#{n}.y"
     end
 
     self.perforce_ignore << "lib/ruby_lexer.rex.rb"
@@ -55,7 +50,7 @@ Hoe.spec "ruby_parser" do
   if plugin?(:racc)
     self.racc_flags << " -t" if ENV["DEBUG"]
     self.racc_flags << " --superclass RubyParser::Parser"
-    # self.racc_flags << " --runtime ruby_parser" # TODO: broken in racc
+    racc_flags = self.racc_flags
   end
 end
 
@@ -84,34 +79,30 @@ def unifdef?
   EOM
 end
 
-V2.each do |n|
-  file "lib/ruby#{n}_parser.y" => "lib/ruby_parser.yy" do |t|
-    unifdef?
-    cmd = 'unifdef -tk -DV=%s -UDEAD %s > %s || true' % [n, t.source, t.name]
-    sh cmd
-  end
+def racc?
+  @racc ||= system("which racc") or abort <<~EOM
+    racc not found! `gem install racc`
+  EOM
+end
 
-  file "lib/ruby#{n}_parser.rb" => "lib/ruby#{n}_parser.y"
+generate_parser = proc do |t|
+  unifdef?
+  racc?
+  n = t.name[/\d+/]
+  sh "unifdef -tk -DV=%s %s | racc %s /dev/stdin -o %s" % [n, t.source, racc_flags, t.name]
+  maybe_add_to_top t.name, "# frozen_string_literal: true"
 end
 
-V3.each do |n|
-  file "lib/ruby#{n}_parser.y" => "lib/ruby3_parser.yy" do |t|
-    unifdef?
-    cmd = 'unifdef -tk -DV=%s -UDEAD %s > %s || true' % [n, t.source, t.name]
-    sh cmd
-  end
+V2.each do |n|
+  file "lib/ruby_parser#{n}.rb" => "lib/ruby_parser2.yy", &generate_parser
+end
 
-  file "lib/ruby#{n}_parser.rb" => "lib/ruby#{n}_parser.y"
+V3.each do |n|
+  file "lib/ruby_parser#{n}.rb" => "lib/ruby_parser3.yy", &generate_parser
 end
 
 file "lib/ruby_lexer.rex.rb" => "lib/ruby_lexer.rex"
 
-task :parser do |t|
-  t.prerequisite_tasks.grep(Rake::FileTask).select(&:already_invoked).each do |f|
-    maybe_add_to_top f.name, "# frozen_string_literal: true"
-  end
-end
-
 task :generate => [:lexer, :parser]
 
 task :clean do
@@ -119,8 +110,8 @@ task :clean do
         Dir["diff.diff"] + # not all diffs. bit me too many times
         Dir["coverage.info"] +
         Dir["coverage"] +
-        Dir["lib/ruby2*_parser.y"] +
-        Dir["lib/ruby3*_parser.y"] +
+        Dir["lib/ruby_parser2*.y"] +
+        Dir["lib/ruby_parser3*.y"] +
         Dir["lib/*.output"])
 end
 
@@ -140,74 +131,78 @@ end
 
 task :isolate => :phony
 
-def in_compare
-  Dir.chdir "compare" do
-    yield
-  end
-end
-
-def dl v
+def dl v, f
   dir = v[/^\d+\.\d+/]
   url = "https://cache.ruby-lang.org/pub/ruby/#{dir}/ruby-#{v}.tar.xz"
-  path = File.basename url
-  unless File.exist? path then
-    system "curl -O #{url}"
-  end
+
+  warn "Downloading ruby #{v}"
+  system "curl -s -o #{f} #{url}"
 end
 
+task :parser => :isolate
+
+multitask :compare_build
+task :compare_build => :generate
+task :compare => :compare_build
+
 def ruby_parse version
   v         = version[/^\d+\.\d+/].delete "."
-  rp_txt    = "rp#{v}.txt"
-  mri_txt   = "mri#{v}.txt"
-  parse_y   = "parse#{v}.y"
-  tarball   = "ruby-#{version}.tar.xz"
-  ruby_dir  = "ruby-#{version}"
-  diff      = "diff#{v}.diff"
-  rp_out    = "lib/ruby#{v}_parser.output"
-  _rp_y     = "lib/ruby#{v}_parser.y"
-  rp_y_rb   = "lib/ruby#{v}_parser.rb"
-
-  c_diff    = "compare/#{diff}"
-  c_rp_txt  = "compare/#{rp_txt}"
-  c_mri_txt = "compare/#{mri_txt}"
-  c_parse_y = "compare/#{parse_y}"
-  c_tarball = "compare/#{tarball}"
+  diff      = "compare/diff#{v}.diff"
+  rp_txt    = "compare/rp#{v}.txt"
+  mri_txt   = "compare/mri#{v}.txt"
+  parse_y   = "compare/parse#{v}.y"
+  tarball   = "compare/ruby-#{version}.tar.xz"
+  ruby_dir  = "compare/ruby-#{version}"
+  rp_out    = "lib/ruby_parser#{v}.output"
+  rp_y_rb   = "lib/ruby_parser#{v}.rb"
   normalize = "compare/normalize.rb"
 
-  file c_tarball do
-    in_compare do
-      dl version
-    end
+  file tarball do
+    dl version, tarball
   end
 
   desc "fetch all tarballs"
-  task :fetch => c_tarball
-
-  file c_parse_y => c_tarball do
-    in_compare do
-      extract_glob = case
-                     # defs/id.def
-                     when version > "3.2" then
-                       "{id.h,parse.y,tool/{id2token.rb,lib/vpath.rb},defs/id.def}"
-                     when version > "2.7" then
-                       "{id.h,parse.y,tool/{id2token.rb,lib/vpath.rb}}"
-                     else
-                       "{id.h,parse.y,tool/{id2token.rb,vpath.rb}}"
-                     end
-      system "tar Jxf #{tarball} #{ruby_dir}/#{extract_glob}"
-
-      Dir.chdir ruby_dir do
-        if File.exist? "tool/id2token.rb" then
-          args = version < "3.2" ? "--path-separator=.:./ id.h" : ""
-          sh "ruby tool/id2token.rb #{args} parse.y | expand > ../#{parse_y}"
-        else
-          sh "expand parse.y > ../#{parse_y}"
-        end
-
-        ruby "-pi", "-e", 'gsub(/^%pure-parser/, "%define api.pure")', "../#{parse_y}"
-      end
-      sh "rm -rf #{ruby_dir}"
+  task :fetch => tarball
+
+  file parse_y => tarball do
+    extract_glob = case
+                   when version > "3.3" then
+                     "{id.h,parse.y,tool/{id2token.rb,lrama},defs/id.def}"
+                   when version > "3.2" then
+                     "{id.h,parse.y,tool/id2token.rb,defs/id.def}"
+                   when version > "2.7" then
+                     "{id.h,parse.y,tool/{id2token.rb,lib/vpath.rb}}"
+                   else
+                     "{id.h,parse.y,tool/{id2token.rb,vpath.rb}}"
+                   end
+    system "tar xf #{tarball} -C compare #{File.basename ruby_dir}/#{extract_glob}"
+
+    # Debugging a new parse build system:
+    #
+    # Unpack the ruby tarball in question, configure, and run the following:
+    #
+    # % touch parse.y; make -n parse.c
+    # ...
+    # echo generating parse.c
+    # /Users/ryan/.rubies.current/bin/ruby --disable=gems ./tool/id2token.rb parse.y | \
+    #       ruby ./tool/lrama/exe/lrama -oparse.c -Hparse.h - parse.y
+    #
+    # Then integrate these commands into the mess below:
+
+    d = ruby_dir
+    cmd = if version > "3.2" then
+            "ruby #{d}/tool/id2token.rb #{d}/parse.y | expand > #{parse_y}"
+          else
+            "ruby #{d}/tool/id2token.rb --path-separator=.:./ #{d}/id.h #{d}/parse.y | expand | ruby -pe 'gsub(/^%pure-parser/, \"%define api.pure\")'  > #{parse_y}"
+          end
+
+    sh cmd
+
+    if File.exist? "#{d}/tool/lrama" then # UGH: this is dumb
+      rm_rf "compare/lrama"
+      sh "mv #{d}/tool/lrama compare"
     end
+    sh "rm -rf #{d}"
   end
 
   bison = Dir["/opt/homebrew/opt/bison/bin/bison",
@@ -215,46 +210,48 @@ def ruby_parse version
               `which bison`.chomp,
              ].first
 
-  file c_mri_txt => [c_parse_y, normalize] do
-    in_compare do
+  file mri_txt => [parse_y, normalize] do
+    if version > "3.3" then
+      sh "./compare/lrama/exe/lrama -r all -ocompare/parse#{v}.tab.c #{parse_y}"
+    else
       sh "#{bison} -r all #{parse_y}"
-      sh "./normalize.rb parse#{v}.output > #{mri_txt}"
-      rm ["parse#{v}.output", "parse#{v}.tab.c"]
+      mv Dir["parse#{v}.*"], "compare"
     end
+
+    sh "#{normalize} compare/parse#{v}.output > #{mri_txt}"
+    rm ["compare/parse#{v}.output", "compare/parse#{v}.tab.c"]
   end
 
   file rp_out => rp_y_rb
 
-  file c_rp_txt => [rp_out, normalize] do
-    in_compare do
-      sh "./normalize.rb ../#{rp_out} > #{rp_txt}"
-    end
+  file rp_txt => [rp_out, normalize] do
+    sh "#{normalize} #{rp_out} > #{rp_txt}"
   end
 
   compare = "compare#{v}"
+  compare_build = "compare_build#{v}"
 
   desc "Compare all grammars to MRI"
   task :compare => compare
+  task :compare_build => compare_build
 
-  file c_diff => [c_mri_txt, c_rp_txt] do
-    in_compare do
-      sh "diff -du #{mri_txt} #{rp_txt} > #{diff}; true"
-    end
+  task compare_build => diff
+
+  file diff => [mri_txt, rp_txt] do
+    sh "diff -du #{mri_txt} #{rp_txt} > #{diff}; true"
   end
 
   desc "Compare #{v} grammar to MRI #{version}"
-  task compare => c_diff do
-    in_compare do
-      system "wc -l #{diff}"
-    end
+  task compare => diff do
+    system "wc -l #{diff}"
   end
 
   task :clean do
-    rm_f Dir[c_mri_txt, c_rp_txt]
+    rm_f Dir[mri_txt, rp_txt]
   end
 
   task :realclean do
-    rm_f Dir[c_parse_y, c_tarball]
+    rm_f Dir[parse_y, tarball]
   end
 end
 
@@ -297,10 +294,11 @@ ruby_parse "2.3.8"
 ruby_parse "2.4.10"
 ruby_parse "2.5.9"
 ruby_parse "2.6.10"
-ruby_parse "2.7.7"
-ruby_parse "3.0.5"
-ruby_parse "3.1.3"
-ruby_parse "3.2.1"
+ruby_parse "2.7.8"
+ruby_parse "3.0.6"
+ruby_parse "3.1.4"
+ruby_parse "3.2.2"
+ruby_parse "3.3.0"
 
 task :debug => :isolate do
   ENV["V"] ||= VERS.last

data/compare/normalize.rb

@@ -202,6 +202,8 @@ ARGF.each_line do |line|
     break
   when /^Terminals/ then               # yacc
     break
+  when /^State \d/ then                # lrama
+    break
   when /^\cL/ then                     # byacc
     break
   else

data/lib/ruby_lexer.rb

@@ -113,11 +113,12 @@ class RubyLexer
   # Last token read via next_token.
   attr_accessor :token
 
-  attr_writer :comments
+  # Last comment lexed, or nil
+  attr_accessor :comment
 
   def initialize _ = nil
     @lex_state = nil # remove one warning under $DEBUG
-    self.lex_state = EXPR_NONE
+    @lex_state = EXPR_NONE
 
     self.cond   = RubyParserStuff::StackState.new(:cond, $DEBUG)
     self.cmdarg = RubyParserStuff::StackState.new(:cmdarg, $DEBUG)
@@ -134,16 +135,6 @@ class RubyLexer
     is_after_operator? ? EXPR_ARG : EXPR_BEG
   end
 
-  def ignore_body_comments
-    @comments.clear
-  end
-
-  def comments # TODO: remove this... maybe comment_string + attr_accessor
-    c = @comments.join
-    @comments.clear
-    c
-  end
-
   def debug n
     raise "debug #{n}"
   end
@@ -258,14 +249,15 @@ class RubyLexer
   end
 
   def process_begin text
-    @comments << matched
+    self.comment ||= +""
+    self.comment << matched
 
     unless scan(/.*?\n=end( |\t|\f)*[^\n]*(\n|\z)/m) then
-      @comments.clear
+      self.comment = nil
       rb_compile_error("embedded document meets end of file")
     end
 
-    @comments << matched
+    self.comment << matched
     self.lineno += matched.count("\n") # HACK?
 
     nil # TODO
@@ -355,8 +347,14 @@ class RubyLexer
     end
   end
 
-  def process_dots text
-    tokens = ruby27plus? && is_beg? ? BTOKENS : TOKENS
+  def process_dots text # parse32.y:10216
+    is_beg = self.is_beg?
+    self.lex_state = EXPR_BEG
+
+    return result EXPR_ENDARG, :tBDOT3, text if
+      parser.in_argdef && text == "..." # TODO: version check?
+
+    tokens = ruby27plus? && is_beg ? BTOKENS : TOKENS
 
     result EXPR_BEG, tokens[text], text
   end
@@ -441,7 +439,8 @@ class RubyLexer
 
       while scan(/\s*\#.*(\n+|\z)/) do
         self.lineno += matched.count "\n"
-        @comments << matched.gsub(/^ +#/, "#").gsub(/^ +$/, "")
+        self.comment ||= +""
+        self.comment << matched.gsub(/^ +#/, "#").gsub(/^ +$/, "")
       end
 
       return nil if end_of_stream?
@@ -689,7 +688,7 @@ class RubyLexer
       return process_token_keyword keyword if keyword
     end
 
-    # matching: compare/parse30.y:9039
+    # matching: compare/parse32.y:9031
     state = if lex_state =~ EXPR_BEG_ANY|EXPR_ARG_ANY|EXPR_DOT then
               cmd_state ? EXPR_CMDARG : EXPR_ARG
             elsif lex_state =~ EXPR_FNAME then
@@ -711,7 +710,7 @@ class RubyLexer
   end
 
   def process_token_keyword keyword
-    # matching MIDDLE of parse_ident in compare/parse23.y:8046
+    # matching MIDDLE of parse_ident in compare/parse32.y:9695
     state = lex_state
 
     return result(EXPR_ENDFN, keyword.id0, token) if lex_state =~ EXPR_FNAME
@@ -720,7 +719,7 @@ class RubyLexer
     self.command_start = true if lex_state =~ EXPR_BEG
 
     case
-    when keyword.id0 == :kDO then # parse26.y line 7591
+    when keyword.id0 == :kDO then # parse32.y line 9712
       case
       when lambda_beginning? then
         self.lpar_beg = nil # lambda_beginning? == FALSE in the body of "-> do ... end"
@@ -762,7 +761,7 @@ class RubyLexer
     self.lineno        = 1
     self.brace_nest    = 0
     self.command_start = true
-    self.comments      = []
+    self.comment       = nil
     self.lex_state     = EXPR_NONE
     self.lex_strterm   = nil
     self.lpar_beg      = nil
@@ -892,7 +891,7 @@ class RubyLexer
     end
 
     def inspect
-      return "Value(0)" if n.zero? # HACK?
+      return "EXPR_NONE" if n.zero? # HACK?
 
       names.map { |v, k| k if self =~ v }.
         compact.

data/lib/ruby_lexer.rex.rb

@@ -2,7 +2,7 @@
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.6.1.
+# Generated by: oedipus_lex version 2.6.2.
 # Source: lib/ruby_lexer.rex
 #++
 
@@ -91,7 +91,6 @@ class RubyLexer
     old_pos - start_of_current_line_pos
   end
 
-
   ##
   # The current scanner class. Must be overridden in subclasses.
 

data/lib/ruby_parser.rb

@@ -69,23 +69,25 @@ end
 ##
 # Unfortunately a problem with racc is that it won't let me namespace
 # properly, so instead of RubyParser::V25, I still have to generate
-# the old Ruby25Parser and shove it in as V25.
-
-require "ruby20_parser"
-require "ruby21_parser"
-require "ruby22_parser"
-require "ruby23_parser"
-require "ruby24_parser"
-require "ruby25_parser"
-require "ruby26_parser"
-require "ruby27_parser"
-require "ruby30_parser"
-require "ruby31_parser"
-require "ruby32_parser"
+# the old RubyParser25 and shove it in as V25.
+
+require "ruby_parser20"
+require "ruby_parser21"
+require "ruby_parser22"
+require "ruby_parser23"
+require "ruby_parser24"
+require "ruby_parser25"
+require "ruby_parser26"
+require "ruby_parser27"
+require "ruby_parser30"
+require "ruby_parser31"
+require "ruby_parser32"
+require "ruby_parser33"
 
 class RubyParser # HACK
   VERSIONS.clear # also a HACK caused by racc namespace issues
 
+  class V33 < ::Ruby33Parser; end
   class V32 < ::Ruby32Parser; end
   class V31 < ::Ruby31Parser; end
   class V30 < ::Ruby30Parser; end