Merge pull request #2559 from ruby/ripper

Ripper translation
ruby · Mar 6, 2024 · 74c3ae0 · 74c3ae0
2 parents cb7c87d + 5cf5f15
commit 74c3ae0
Show file tree

Hide file tree

Showing 10 changed files with 3,545 additions and 1,127 deletions.
diff --git a/bin/prism b/bin/prism
@@ -48,15 +48,19 @@ module Prism
       require "benchmark/ips"
       require "parser/current"
       require "ruby_parser"
+      require "ripper"
 
       filepath = argv.fetch(0) { File.expand_path("../lib/prism/node.rb", __dir__) }
+      source = File.read(filepath)
 
       Benchmark.ips do |x|
-        x.report("prism") { Prism.parse_file(filepath) }
-        x.report("parser") { Parser::CurrentRuby.parse_file(filepath) }
-        x.report("Prism::Translation::Parser") { Prism::Translation::Parser.parse_file(filepath) }
-        x.report("ruby_parser") { RubyParser.new.parse(File.read(filepath), filepath) }
-        x.report("Prism::Translation::RubyParser") { Prism::Translation::RubyParser.parse_file(filepath) }
+        x.report("Prism") { Prism.parse(source, filepath: filepath) }
+        x.report("Ripper::SexpBuilder") { Ripper.sexp_raw(source, filepath) }
+        x.report("Prism::Translation::Ripper::SexpBuilder") { Prism::Translation::Ripper.sexp_raw(source, filepath) }
+        x.report("Parser::CurrentRuby") { Parser::CurrentRuby.parse(source, filepath) }
+        x.report("Prism::Translation::Parser") { Prism::Translation::Parser.parse(source, filepath) }
+        x.report("RubyParser") { RubyParser.new.parse(source, filepath) }
+        x.report("Prism::Translation::RubyParser") { Prism::Translation::RubyParser.new.parse(source, filepath) }
         x.compare!
       end
     end
@@ -247,7 +251,7 @@ module Prism
       source, filepath = read_source(argv)
 
       ripper = Ripper.sexp_raw(source)
-      prism = Prism::Translation::Ripper.sexp_raw(source) rescue :parse_error
+      prism = Prism::Translation::Ripper.sexp_raw(source)
 
       puts "Ripper:"
       pp ripper

diff --git a/lib/prism/translation/parser/compiler.rb b/lib/prism/translation/parser/compiler.rb
@@ -800,6 +800,7 @@ def visit_if_node(node)
         end
 
         # 1i
+        # ^^
         def visit_imaginary_node(node)
           visit_numeric(node, builder.complex([imaginary_value(node), srange(node.location)]))
         end
@@ -887,9 +888,6 @@ def visit_instance_variable_read_node(node)
 
         # @foo = 1
         # ^^^^^^^^
-        #
-        # @foo, @bar = 1
-        # ^^^^  ^^^^
         def visit_instance_variable_write_node(node)
           builder.assign(
             builder.assignable(builder.ivar(token(node.name_loc))),
@@ -1033,9 +1031,6 @@ def visit_local_variable_read_node(node)
 
         # foo = 1
         # ^^^^^^^
-        #
-        # foo, bar = 1
-        # ^^^  ^^^
         def visit_local_variable_write_node(node)
           builder.assign(
             builder.assignable(builder.ident(token(node.name_loc))),