[ruby/prism] Rename Ruby 3.5 to Ruby 4.0

Earlopain · matzbot · commit 7037d8f89e71 · 2025-11-08T00:22:17.000Z
See ruby@6d81969 It leaves the old variant around. RuboCop for examples accesses `Prism::Translation::Parser35` to test against ruby-head. For now I left these simply as an alias ruby/prism@d0a823f045
diff --git a/lib/prism/ffi.rb b/lib/prism/ffi.rb
@@ -432,10 +432,8 @@ def dump_options_version(version)
         1
       when /\A3\.4(\.\d+)?\z/
         2
-      when /\A3\.5(\.\d+)?\z/
+      when /\A3\.5(\.\d+)?\z/, /\A4\.0(\.\d+)?\z/
         3
-      when /\A4\.0(\.\d+)?\z/
-        4
       else
         if current
           raise CurrentVersionError, RUBY_VERSION
diff --git a/lib/prism/prism.gemspec b/lib/prism/prism.gemspec
@@ -101,6 +101,7 @@ Gem::Specification.new do |spec|
     "lib/prism/translation/parser33.rb",
     "lib/prism/translation/parser34.rb",
     "lib/prism/translation/parser35.rb",
+    "lib/prism/translation/parser40.rb",
     "lib/prism/translation/parser/builder.rb",
     "lib/prism/translation/parser/compiler.rb",
     "lib/prism/translation/parser/lexer.rb",
@@ -123,6 +124,7 @@ Gem::Specification.new do |spec|
     "rbi/prism/translation/parser33.rbi",
     "rbi/prism/translation/parser34.rbi",
     "rbi/prism/translation/parser35.rbi",
+    "rbi/prism/translation/parser40.rbi",
     "rbi/prism/translation/ripper.rbi",
     "rbi/prism/visitor.rbi",
     "sig/prism.rbs",
diff --git a/lib/prism/translation.rb b/lib/prism/translation.rb
@@ -10,6 +10,7 @@ module Translation # steep:ignore
     autoload :Parser33, "prism/translation/parser33"
     autoload :Parser34, "prism/translation/parser34"
     autoload :Parser35, "prism/translation/parser35"
+    autoload :Parser40, "prism/translation/parser40"
     autoload :Ripper, "prism/translation/ripper"
     autoload :RubyParser, "prism/translation/ruby_parser"
   end
diff --git a/lib/prism/translation/parser.rb b/lib/prism/translation/parser.rb
@@ -84,7 +84,7 @@ def initialize(builder = Prism::Translation::Parser::Builder.new, parser: Prism)
       end
 
       def version # :nodoc:
-        35
+        40
       end
 
       # The default encoding for Ruby files is UTF-8.
@@ -356,8 +356,8 @@ def convert_for_prism(version)
           "3.3.1"
         when 34
           "3.4.0"
-        when 35
-          "3.5.0"
+        when 35, 40
+          "4.0.0"
         else
           "latest"
         end
diff --git a/lib/prism/translation/parser35.rb b/lib/prism/translation/parser35.rb
@@ -3,11 +3,6 @@
 
 module Prism
   module Translation
-    # This class is the entry-point for Ruby 3.5 of `Prism::Translation::Parser`.
-    class Parser35 < Parser
-      def version # :nodoc:
-        35
-      end
-    end
+    Parser35 = Parser40 # :nodoc:
   end
 end
diff --git a/lib/prism/translation/parser40.rb b/lib/prism/translation/parser40.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# :markup: markdown
+
+module Prism
+  module Translation
+    # This class is the entry-point for Ruby 4.0 of `Prism::Translation::Parser`.
+    class Parser40 < Parser
+      def version # :nodoc:
+        40
+      end
+    end
+  end
+end
diff --git a/lib/prism/translation/parser_current.rb b/lib/prism/translation/parser_current.rb
@@ -10,8 +10,8 @@ module Translation
       ParserCurrent = Parser33
     when /^3\.4\./
       ParserCurrent = Parser34
-    when /^3\.5\./
-      ParserCurrent = Parser35
+    when /^3\.5\./, /^4\.0\./
+      ParserCurrent = Parser40
     else
       # Keep this in sync with released Ruby.
       parser = Parser34
diff --git a/prism/options.c b/prism/options.c
@@ -88,36 +88,26 @@ pm_options_version_set(pm_options_t *options, const char *version, size_t length
             return true;
         }
 
-        if (strncmp(version, "3.5", 3) == 0) {
-            options->version = PM_OPTIONS_VERSION_CRUBY_3_5;
-            return true;
-        }
-
-        if (strncmp(version, "4.0", 3) == 0) {
+        if (strncmp(version, "3.5", 3) == 0 || strncmp(version, "4.0", 3) == 0) {
             options->version = PM_OPTIONS_VERSION_CRUBY_4_0;
             return true;
         }
 
         return false;
     }
 
-    if (length >= 4) {
-        if (strncmp(version, "3.3.", 4) == 0 && is_number(version + 4, length - 4)) {
+    if (length >= 4 && is_number(version + 4, length - 4)) {
+        if (strncmp(version, "3.3.", 4) == 0) {
             options->version = PM_OPTIONS_VERSION_CRUBY_3_3;
             return true;
         }
 
-        if (strncmp(version, "3.4.", 4) == 0 && is_number(version + 4, length - 4)) {
+        if (strncmp(version, "3.4.", 4) == 0) {
             options->version = PM_OPTIONS_VERSION_CRUBY_3_4;
             return true;
         }
 
-        if (strncmp(version, "3.5.", 4) == 0 && is_number(version + 4, length - 4)) {
-            options->version = PM_OPTIONS_VERSION_CRUBY_3_5;
-            return true;
-        }
-
-        if (strncmp(version, "4.0.", 4) == 0 && is_number(version + 4, length - 4)) {
+        if (strncmp(version, "3.5.", 4) == 0 || strncmp(version, "4.0.", 4) == 0) {
             options->version = PM_OPTIONS_VERSION_CRUBY_4_0;
             return true;
         }
diff --git a/prism/options.h b/prism/options.h
@@ -91,11 +91,11 @@ typedef enum {
     /** The vendored version of prism in CRuby 3.4.x. */
     PM_OPTIONS_VERSION_CRUBY_3_4 = 2,
 
-    /** The vendored version of prism in CRuby 3.5.x. */
+    /** The vendored version of prism in CRuby 4.0.x. */
     PM_OPTIONS_VERSION_CRUBY_3_5 = 3,
 
     /** The vendored version of prism in CRuby 4.0.x. */
-    PM_OPTIONS_VERSION_CRUBY_4_0 = 4,
+    PM_OPTIONS_VERSION_CRUBY_4_0 = 3,
 
     /** The current version of prism. */
     PM_OPTIONS_VERSION_LATEST = PM_OPTIONS_VERSION_CRUBY_4_0
diff --git a/prism/prism.c b/prism/prism.c
@@ -10864,11 +10864,11 @@ parser_lex(pm_parser_t *parser) {
                             }
 
 
-                            // If we are parsing as CRuby 3.5 or later and we
+                            // If we are parsing as CRuby 4.0 or later and we
                             // hit a '&&' or a '||' then we will lex the ignored
                             // newline.
                             if (
-                                (parser->version >= PM_OPTIONS_VERSION_CRUBY_3_5) &&
+                                (parser->version >= PM_OPTIONS_VERSION_CRUBY_4_0) &&
                                 following && (
                                     (peek_at(parser, following) == '&' && peek_at(parser, following + 1) == '&') ||
                                     (peek_at(parser, following) == '|' && peek_at(parser, following + 1) == '|') ||
@@ -10915,7 +10915,7 @@ parser_lex(pm_parser_t *parser) {
                             LEX(PM_TOKEN_AMPERSAND_DOT);
                         }
 
-                        if (parser->version >= PM_OPTIONS_VERSION_CRUBY_3_5) {
+                        if (parser->version >= PM_OPTIONS_VERSION_CRUBY_4_0) {
                             // If we hit an && then we are in a logical chain
                             // and we need to return the logical operator.
                             if (peek_at(parser, next_content) == '&' && peek_at(parser, next_content + 1) == '&') {
@@ -19625,7 +19625,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
                 statements = (pm_node_t *) pm_statements_node_create(parser);
 
                 bool allow_command_call;
-                if (parser->version >= PM_OPTIONS_VERSION_CRUBY_3_5) {
+                if (parser->version >= PM_OPTIONS_VERSION_CRUBY_4_0) {
                     allow_command_call = accepts_command_call;
                 } else {
                     // Allow `def foo = puts "Hello"` but not `private def foo = puts "Hello"`
diff --git a/test/prism/api/parse_test.rb b/test/prism/api/parse_test.rb
@@ -119,6 +119,9 @@ def test_version
       assert Prism.parse_success?("1 + 1", version: "3.5")
       assert Prism.parse_success?("1 + 1", version: "3.5.0")
 
+      assert Prism.parse_success?("1 + 1", version: "4.0")
+      assert Prism.parse_success?("1 + 1", version: "4.0.0")
+
       assert Prism.parse_success?("1 + 1", version: "latest")
 
       # Test edge case
diff --git a/test/prism/fixtures/4.0/endless_methods_command_call.txt b/test/prism/fixtures/4.0/endless_methods_command_call.txt
diff --git a/test/prism/fixtures/4.0/leading_logical.txt b/test/prism/fixtures/4.0/leading_logical.txt
diff --git a/test/prism/fixtures_test.rb b/test/prism/fixtures_test.rb
@@ -35,8 +35,8 @@ class FixturesTest < TestCase
     except << "3.3-3.3/return_in_sclass.txt"
 
     # Leaving these out until they are supported by parse.y.
-    except << "3.5/leading_logical.txt"
-    except << "3.5/endless_methods_command_call.txt"
+    except << "4.0/leading_logical.txt"
+    except << "4.0/endless_methods_command_call.txt"
     # https://bugs.ruby-lang.org/issues/21168#note-5
     except << "command_method_call_2.txt"
 
diff --git a/test/prism/lex_test.rb b/test/prism/lex_test.rb
@@ -43,10 +43,10 @@ class LexTest < TestCase
     end
 
     # https://bugs.ruby-lang.org/issues/20925
-    except << "3.5/leading_logical.txt"
+    except << "4.0/leading_logical.txt"
 
     # https://bugs.ruby-lang.org/issues/17398#note-12
-    except << "3.5/endless_methods_command_call.txt"
+    except << "4.0/endless_methods_command_call.txt"
 
     # https://bugs.ruby-lang.org/issues/21168#note-5
     except << "command_method_call_2.txt"
diff --git a/test/prism/locals_test.rb b/test/prism/locals_test.rb
@@ -38,8 +38,8 @@ class LocalsTest < TestCase
       "3.3-3.3/return_in_sclass.txt",
 
       # Leaving these out until they are supported by parse.y.
-      "3.5/leading_logical.txt",
-      "3.5/endless_methods_command_call.txt",
+      "4.0/leading_logical.txt",
+      "4.0/endless_methods_command_call.txt",
       "command_method_call_2.txt"
     ]
 
diff --git a/test/prism/ractor_test.rb b/test/prism/ractor_test.rb
@@ -64,7 +64,7 @@ def with_ractor(*arguments, &block)
         else
           ractor = ignore_warnings { Ractor.new(*arguments, &block) }
 
-          # Somewhere in the Ruby 3.5.* series, Ractor#take was removed and
+          # Somewhere in the Ruby 4.0.* series, Ractor#take was removed and
           # Ractor#value was added.
           puts(ractor.respond_to?(:value) ? ractor.value : ractor.take)
         end
diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb
@@ -69,10 +69,10 @@ class ParserTest < TestCase
       "3.4/circular_parameters.txt",
 
       # Cannot yet handling leading logical operators.
-      "3.5/leading_logical.txt",
+      "4.0/leading_logical.txt",
 
-      # Ruby >= 3.5 specific syntax
-      "3.5/endless_methods_command_call.txt",
+      # Ruby >= 4.0 specific syntax
+      "4.0/endless_methods_command_call.txt",
 
       # https://bugs.ruby-lang.org/issues/21168#note-5
       "command_method_call_2.txt",
@@ -172,6 +172,7 @@ def test_non_prism_builder_class_deprecated
     if RUBY_VERSION >= "3.3"
       def test_current_parser_for_current_ruby
         major, minor = current_major_minor.split(".")
+        return if major == "3" && minor == "5" # TODO: Remove once ruby-dev becomes 4.0
         # Let's just hope there never is a Ruby 3.10 or similar
         expected = major.to_i * 10 + minor.to_i
         assert_equal(expected, Translation::ParserCurrent.new.version)
diff --git a/test/prism/ruby/ripper_test.rb b/test/prism/ruby/ripper_test.rb
@@ -9,7 +9,7 @@ class RipperTest < TestCase
     # Skip these tests that Ripper is reporting the wrong results for.
     incorrect = [
       # Not yet supported.
-      "3.5/leading_logical.txt",
+      "4.0/leading_logical.txt",
 
       # Ripper incorrectly attributes the block to the keyword.
       "seattlerb/block_break.txt",
@@ -40,7 +40,7 @@ class RipperTest < TestCase
       "3.4/circular_parameters.txt",
 
       # https://bugs.ruby-lang.org/issues/17398#note-12
-      "3.5/endless_methods_command_call.txt",
+      "4.0/endless_methods_command_call.txt",
 
       # https://bugs.ruby-lang.org/issues/21168#note-5
       "command_method_call_2.txt",
diff --git a/test/prism/ruby/ruby_parser_test.rb b/test/prism/ruby/ruby_parser_test.rb
@@ -84,8 +84,8 @@ class RubyParserTest < TestCase
 
       "3.4/circular_parameters.txt",
 
-      "3.5/endless_methods_command_call.txt",
-      "3.5/leading_logical.txt",
+      "4.0/endless_methods_command_call.txt",
+      "4.0/leading_logical.txt",
 
       # https://bugs.ruby-lang.org/issues/21168#note-5
       "command_method_call_2.txt",
diff --git a/test/prism/test_helper.rb b/test/prism/test_helper.rb
@@ -230,7 +230,7 @@ def self.windows?
     end
 
     # All versions that prism can parse
-    SYNTAX_VERSIONS = %w[3.3 3.4 3.5 4.0]
+    SYNTAX_VERSIONS = %w[3.3 3.4 4.0]
 
     # Returns an array of ruby versions that a given filepath should test against:
     # test.txt         # => all available versions
@@ -256,6 +256,7 @@ def current_major_minor
 
     if RUBY_VERSION >= "3.3.0"
       def test_all_syntax_versions_present
+        return if RUBY_VERSION.start_with?("3.5") # TODO: Remove once ruby-dev becomes 4.0
         assert_include(SYNTAX_VERSIONS, current_major_minor)
       end
     end

Original file line number	Diff line number	Diff line change
`@@ -432,10 +432,8 @@ def dump_options_version(version)`
`432`	`432`	`1`
`433`	`433`	`when /\A3\.4(\.\d+)?\z/`
`434`	`434`	`2`
`435`		`- when /\A3\.5(\.\d+)?\z/`
	`435`	`+ when /\A3\.5(\.\d+)?\z/, /\A4\.0(\.\d+)?\z/`
`436`	`436`	`3`
`437`		`- when /\A4\.0(\.\d+)?\z/`
`438`		`- 4`
`439`	`437`	`else`
`440`	`438`	`if current`
`441`	`439`	`raise CurrentVersionError, RUBY_VERSION`