[GR-45043] Import Prism v1.4.0

PullRequest: truffleruby/4508

Author: andrykonchin

CHANGELOG.md

@@ -8,6 +8,7 @@ Bug fixes:
 * Fix `Range#cover?` on begin-less ranges and non-integer values (@nirvdrum, @rwstauner).
 * Fix `Time.new` with String argument and handle nanoseconds correctly (#3836, @andrykonchin).
 * Fix a possible case of infinite recursion when implementing `frozen?` in a native extension (@nirvdrum).
+* Fix parameters forwarding to a method call executed with `Kernel#eval` (@andrykonchin).
 
 Compatibility:
 

lib/gems/specifications/default/prism-1.1.0.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+# stub: prism 1.4.0 ruby lib
+# stub: ext/prism/extconf.rb
+
+Gem::Specification.new do |s|
+  s.name = "prism".freeze
+  s.version = "1.4.0".freeze
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.metadata = { "allowed_push_host" => "https://rubygems.org", "changelog_uri" => "https://github.com/ruby/prism/blob/main/CHANGELOG.md", "source_code_uri" => "https://github.com/ruby/prism" } if s.respond_to? :metadata=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Shopify".freeze]
+  s.date = "2025-04-01"
+  s.email = ["ruby@shopify.com".freeze]
+  s.extensions = ["ext/prism/extconf.rb".freeze]
+  s.files = ["BSDmakefile".freeze, "CHANGELOG.md".freeze, "CODE_OF_CONDUCT.md".freeze, "CONTRIBUTING.md".freeze, "LICENSE.md".freeze, "Makefile".freeze, "README.md".freeze, "config.yml".freeze, "docs/build_system.md".freeze, "docs/configuration.md".freeze, "docs/cruby_compilation.md".freeze, "docs/design.md".freeze, "docs/encoding.md".freeze, "docs/fuzzing.md".freeze, "docs/heredocs.md".freeze, "docs/javascript.md".freeze, "docs/local_variable_depth.md".freeze, "docs/mapping.md".freeze, "docs/parser_translation.md".freeze, "docs/parsing_rules.md".freeze, "docs/releasing.md".freeze, "docs/relocation.md".freeze, "docs/ripper_translation.md".freeze, "docs/ruby_api.md".freeze, "docs/ruby_parser_translation.md".freeze, "docs/serialization.md".freeze, "docs/testing.md".freeze, "ext/prism/api_node.c".freeze, "ext/prism/api_pack.c".freeze, "ext/prism/extconf.rb".freeze, "ext/prism/extension.c".freeze, "ext/prism/extension.h".freeze, "include/prism.h".freeze, "include/prism/ast.h".freeze, "include/prism/defines.h".freeze, "include/prism/diagnostic.h".freeze, "include/prism/encoding.h".freeze, "include/prism/node.h".freeze, "include/prism/options.h".freeze, "include/prism/pack.h".freeze, "include/prism/parser.h".freeze, "include/prism/prettyprint.h".freeze, "include/prism/regexp.h".freeze, "include/prism/static_literals.h".freeze, "include/prism/util/pm_buffer.h".freeze, "include/prism/util/pm_char.h".freeze, "include/prism/util/pm_constant_pool.h".freeze, "include/prism/util/pm_integer.h".freeze, "include/prism/util/pm_list.h".freeze, "include/prism/util/pm_memchr.h".freeze, "include/prism/util/pm_newline_list.h".freeze, "include/prism/util/pm_string.h".freeze, "include/prism/util/pm_strncasecmp.h".freeze, "include/prism/util/pm_strpbrk.h".freeze, "include/prism/version.h".freeze, "lib/prism.rb".freeze, "lib/prism/compiler.rb".freeze, "lib/prism/desugar_compiler.rb".freeze, "lib/prism/dispatcher.rb".freeze, "lib/prism/dot_visitor.rb".freeze, "lib/prism/dsl.rb".freeze, "lib/prism/ffi.rb".freeze, "lib/prism/inspect_visitor.rb".freeze, "lib/prism/lex_compat.rb".freeze, "lib/prism/mutation_compiler.rb".freeze, "lib/prism/node.rb".freeze, "lib/prism/node_ext.rb".freeze, "lib/prism/pack.rb".freeze, "lib/prism/parse_result.rb".freeze, "lib/prism/parse_result/comments.rb".freeze, "lib/prism/parse_result/errors.rb".freeze, "lib/prism/parse_result/newlines.rb".freeze, "lib/prism/pattern.rb".freeze, "lib/prism/polyfill/append_as_bytes.rb".freeze, "lib/prism/polyfill/byteindex.rb".freeze, "lib/prism/polyfill/unpack1.rb".freeze, "lib/prism/reflection.rb".freeze, "lib/prism/relocation.rb".freeze, "lib/prism/serialize.rb".freeze, "lib/prism/string_query.rb".freeze, "lib/prism/translation.rb".freeze, "lib/prism/translation/parser.rb".freeze, "lib/prism/translation/parser/builder.rb".freeze, "lib/prism/translation/parser/compiler.rb".freeze, "lib/prism/translation/parser/lexer.rb".freeze, "lib/prism/translation/parser33.rb".freeze, "lib/prism/translation/parser34.rb".freeze, "lib/prism/translation/parser35.rb".freeze, "lib/prism/translation/ripper.rb".freeze, "lib/prism/translation/ripper/sexp.rb".freeze, "lib/prism/translation/ripper/shim.rb".freeze, "lib/prism/translation/ruby_parser.rb".freeze, "lib/prism/visitor.rb".freeze, "prism.gemspec".freeze, "rbi/prism.rbi".freeze, "rbi/prism/compiler.rbi".freeze, "rbi/prism/dsl.rbi".freeze, "rbi/prism/inspect_visitor.rbi".freeze, "rbi/prism/node.rbi".freeze, "rbi/prism/node_ext.rbi".freeze, "rbi/prism/parse_result.rbi".freeze, "rbi/prism/reflection.rbi".freeze, "rbi/prism/string_query.rbi".freeze, "rbi/prism/translation/parser.rbi".freeze, "rbi/prism/translation/parser33.rbi".freeze, "rbi/prism/translation/parser34.rbi".freeze, "rbi/prism/translation/parser35.rbi".freeze, "rbi/prism/translation/ripper.rbi".freeze, "rbi/prism/visitor.rbi".freeze, "sig/prism.rbs".freeze, "sig/prism/compiler.rbs".freeze, "sig/prism/dispatcher.rbs".freeze, "sig/prism/dot_visitor.rbs".freeze, "sig/prism/dsl.rbs".freeze, "sig/prism/inspect_visitor.rbs".freeze, "sig/prism/lex_compat.rbs".freeze, "sig/prism/mutation_compiler.rbs".freeze, "sig/prism/node.rbs".freeze, "sig/prism/node_ext.rbs".freeze, "sig/prism/pack.rbs".freeze, "sig/prism/parse_result.rbs".freeze, "sig/prism/pattern.rbs".freeze, "sig/prism/reflection.rbs".freeze, "sig/prism/relocation.rbs".freeze, "sig/prism/serialize.rbs".freeze, "sig/prism/string_query.rbs".freeze, "sig/prism/visitor.rbs".freeze, "src/diagnostic.c".freeze, "src/encoding.c".freeze, "src/node.c".freeze, "src/options.c".freeze, "src/pack.c".freeze, "src/prettyprint.c".freeze, "src/prism.c".freeze, "src/regexp.c".freeze, "src/serialize.c".freeze, "src/static_literals.c".freeze, "src/token_type.c".freeze, "src/util/pm_buffer.c".freeze, "src/util/pm_char.c".freeze, "src/util/pm_constant_pool.c".freeze, "src/util/pm_integer.c".freeze, "src/util/pm_list.c".freeze, "src/util/pm_memchr.c".freeze, "src/util/pm_newline_list.c".freeze, "src/util/pm_string.c".freeze, "src/util/pm_strncasecmp.c".freeze, "src/util/pm_strpbrk.c".freeze]
+  s.homepage = "https://github.com/ruby/prism".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.7.0".freeze)
+  s.rubygems_version = "3.5.16".freeze
+  s.summary = "Prism Ruby parser".freeze
+end
+

lib/gems/specifications/default/prism-1.4.0.gemspec

@@ -24,7 +24,9 @@ module Prism
   autoload :Pack, "prism/pack"
   autoload :Pattern, "prism/pattern"
   autoload :Reflection, "prism/reflection"
+  autoload :Relocation, "prism/relocation"
   autoload :Serialize, "prism/serialize"
+  autoload :StringQuery, "prism/string_query"
   autoload :Translation, "prism/translation"
   autoload :Visitor, "prism/visitor"
 
@@ -57,11 +59,11 @@ def self.lex_ripper(source)
   end
 
   # :call-seq:
-  #   Prism::load(source, serialized) -> ParseResult
+  #   Prism::load(source, serialized, freeze) -> ParseResult
   #
   # Load the serialized AST using the source as a reference into a tree.
-  def self.load(source, serialized)
-    Serialize.load(source, serialized)
+  def self.load(source, serialized, freeze = false)
+    Serialize.load_parse(source, serialized, freeze)
   end
 end
 
@@ -75,13 +77,13 @@ def self.load(source, serialized)
 # it's going to require the built library. Otherwise, it's going to require a
 # module that uses FFI to call into the library.
 if RUBY_ENGINE == "ruby" and !ENV["PRISM_FFI_BACKEND"]
-  require "prism/prism"
-
   # The C extension is the default backend on CRuby.
   Prism::BACKEND = :CEXT
-else
-  require_relative "prism/ffi"
 
+  require "prism/prism"
+else
   # The FFI backend is used on other Ruby implementations.
   Prism::BACKEND = :FFI
+
+  require_relative "prism/ffi"
 end

lib/mri/prism.rb

@@ -3608,6 +3608,9 @@ def visit_parentheses_node(node)
       table = Table.new("ParenthesesNode")
       id = node_id(node)
 
+      # flags
+      table.field("flags", parentheses_node_flags_inspect(node))
+
       # body
       unless (body = node.body).nil?
         table.field("body", port: true)
@@ -3954,6 +3957,11 @@ def visit_rescue_node(node)
         digraph.edge("#{id}:reference -> #{node_id(reference)};")
       end
 
+      # then_keyword_loc
+      unless (then_keyword_loc = node.then_keyword_loc).nil?
+        table.field("then_keyword_loc", location_inspect(then_keyword_loc))
+      end
+
       # statements
       unless (statements = node.statements).nil?
         table.field("statements", port: true)
@@ -4414,6 +4422,11 @@ def visit_until_node(node)
       # keyword_loc
       table.field("keyword_loc", location_inspect(node.keyword_loc))
 
+      # do_keyword_loc
+      unless (do_keyword_loc = node.do_keyword_loc).nil?
+        table.field("do_keyword_loc", location_inspect(do_keyword_loc))
+      end
+
       # closing_loc
       unless (closing_loc = node.closing_loc).nil?
         table.field("closing_loc", location_inspect(closing_loc))
@@ -4490,6 +4503,11 @@ def visit_while_node(node)
       # keyword_loc
       table.field("keyword_loc", location_inspect(node.keyword_loc))
 
+      # do_keyword_loc
+      unless (do_keyword_loc = node.do_keyword_loc).nil?
+        table.field("do_keyword_loc", location_inspect(do_keyword_loc))
+      end
+
       # closing_loc
       unless (closing_loc = node.closing_loc).nil?
         table.field("closing_loc", location_inspect(closing_loc))
@@ -4672,6 +4690,14 @@ def parameter_flags_inspect(node)
       flags.join(", ")
     end
 
+    # Inspect a node that has parentheses_node_flags flags to display the flags as a
+    # comma-separated list.
+    def parentheses_node_flags_inspect(node)
+      flags = [] #: Array[String]
+      flags << "multiple_statements" if node.multiple_statements?
+      flags.join(", ")
+    end
+
     # Inspect a node that has range_flags flags to display the flags as a
     # comma-separated list.
     def range_flags_inspect(node)

lib/mri/prism/dot_visitor.rb

@@ -714,8 +714,8 @@ def rescue_modifier_node(source: default_source, node_id: 0, location: default_l
     end
 
     # Create a new RescueNode node.
-    def rescue_node(source: default_source, node_id: 0, location: default_location, flags: 0, keyword_loc: location, exceptions: [], operator_loc: nil, reference: nil, statements: nil, subsequent: nil)
-      RescueNode.new(source, node_id, location, flags, keyword_loc, exceptions, operator_loc, reference, statements, subsequent)
+    def rescue_node(source: default_source, node_id: 0, location: default_location, flags: 0, keyword_loc: location, exceptions: [], operator_loc: nil, reference: nil, then_keyword_loc: nil, statements: nil, subsequent: nil)
+      RescueNode.new(source, node_id, location, flags, keyword_loc, exceptions, operator_loc, reference, then_keyword_loc, statements, subsequent)
     end
 
     # Create a new RestParameterNode node.
@@ -804,8 +804,8 @@ def unless_node(source: default_source, node_id: 0, location: default_location,
     end
 
     # Create a new UntilNode node.
-    def until_node(source: default_source, node_id: 0, location: default_location, flags: 0, keyword_loc: location, closing_loc: nil, predicate: default_node(source, location), statements: nil)
-      UntilNode.new(source, node_id, location, flags, keyword_loc, closing_loc, predicate, statements)
+    def until_node(source: default_source, node_id: 0, location: default_location, flags: 0, keyword_loc: location, do_keyword_loc: nil, closing_loc: nil, predicate: default_node(source, location), statements: nil)
+      UntilNode.new(source, node_id, location, flags, keyword_loc, do_keyword_loc, closing_loc, predicate, statements)
     end
 
     # Create a new WhenNode node.
@@ -814,8 +814,8 @@ def when_node(source: default_source, node_id: 0, location: default_location, fl
     end
 
     # Create a new WhileNode node.
-    def while_node(source: default_source, node_id: 0, location: default_location, flags: 0, keyword_loc: location, closing_loc: nil, predicate: default_node(source, location), statements: nil)
-      WhileNode.new(source, node_id, location, flags, keyword_loc, closing_loc, predicate, statements)
+    def while_node(source: default_source, node_id: 0, location: default_location, flags: 0, keyword_loc: location, do_keyword_loc: nil, closing_loc: nil, predicate: default_node(source, location), statements: nil)
+      WhileNode.new(source, node_id, location, flags, keyword_loc, do_keyword_loc, closing_loc, predicate, statements)
     end
 
     # Create a new XStringNode node.
@@ -912,6 +912,14 @@ def parameter_flag(name)
       end
     end
 
+    # Retrieve the value of one of the ParenthesesNodeFlags flags.
+    def parentheses_node_flag(name)
+      case name
+      when :multiple_statements then ParenthesesNodeFlags::MULTIPLE_STATEMENTS
+      else Kernel.raise ArgumentError, "invalid ParenthesesNodeFlags flag: #{name.inspect}"
+      end
+    end
+
     # Retrieve the value of one of the RangeFlags flags.
     def range_flag(name)
       case name