[GR-45621] Minor improvements for jt test :next command

PullRequest: truffleruby/3751

Author: andrykonchin

doc/contributor/updating-ruby.md

@@ -160,7 +160,7 @@ Update all of these:
 
 For a new major version:
 * Update `TargetRubyVersion` in `.rubocop.yml`
-* Update the list of `:next` specs and change the "next version" in `spec/truffleruby.mspec`.
+* Update the list of `:next` specs.
 * Update the docs for next version specs in [workflow.md](workflow.md).
 * Update the versions in the `ruby/spec on CRuby` job of `.github/workflows/ci.yml`.
 

doc/contributor/workflow.md

@@ -296,7 +296,7 @@ TruffleRuby currently targets Ruby 3.1. However, we welcome pull requests for
 Ruby 3.2 features as long as they don't conflict significantly with
 Ruby 3.1 semantics.
 
-It is possible to run specs for Ruby 3.1 features by setting
+It is possible to run specs for Ruby 3.2 features by setting
 `PRETEND_RUBY_VERSION`:
 
 ```bash
@@ -306,8 +306,8 @@ PRETEND_RUBY_VERSION=3.2.0 jt test spec/ruby/.../some_spec.rb
 This also works for `jt tag`/`jt untag`.
 
 When working on a feature from the next version of Ruby, add the spec file in
-the corresponding file list (`:next`) in `spec/truffleruby.mspec` so that the
-specs are run in CI too.
+the corresponding files list in `spec/truffleruby.next-specs` so that the specs
+are run in CI too.
 
 ## How to fix a failing MRI test
 

spec/truffleruby.mspec

@@ -101,11 +101,13 @@ class MSpecScript
     "spec/truffle/capi"
   ]
 
-  # Use spec/ruby/core/nil/nil_spec.rb as a dummy file to avoid being empty
-  set :next, %w[
-    spec/ruby/core/nil/nil_spec.rb
-    spec/ruby/core/hash/shift_spec.rb
-  ]
+  # Use spec/truffleruby.next-specs to specify spec files to run for the next version.
+  # Allow comments and empty lines.
+  next_spec_files = File.readlines("spec/truffleruby.next-specs")
+                        .map(&:strip)
+                        .reject { |path| path.start_with?("#") || path.empty?  }
+
+  set :next, next_spec_files
 
   set :tags_patterns, [
     [%r(^(.*)/spec/ruby/(\w+)/(.+)_spec\.rb$), '\1/spec/tags/\2/\3_tags.txt'],
@@ -154,8 +156,13 @@ if MSpecScript.child_process?
     ::VersionGuard.send :remove_const, :FULL_RUBY_VERSION
     ::VersionGuard::FULL_RUBY_VERSION = SpecVersion.new(version)
   elsif ARGV.include? ":next"
+    version = File.read(".ruby-version")
+
+    # get the next version, e.g. 3.1.2 -> 3.2.0
+    next_version = version.split(".").tap { |ary| ary[1] = ary[1].next; ary[2] = '0' }.join(".")
+
     ::VersionGuard.send :remove_const, :FULL_RUBY_VERSION
-    ::VersionGuard::FULL_RUBY_VERSION = SpecVersion.new("3.2.0")
+    ::VersionGuard::FULL_RUBY_VERSION = SpecVersion.new(next_version)
   end
 end
 

spec/truffleruby.next-specs

@@ -0,0 +1,12 @@
+# This file contains a list of spec files that contain specs for already
+# implemented features of the next CRuby release.
+#
+# These specs should be run as a separate step with `jt test :next` command
+# until TruffleRuby supports this next CRuby version.
+#
+# Empty lines and comments are allowed.
+
+# Use spec/ruby/core/nil/nil_spec.rb as a dummy file to avoid being empty (what causes mspec to error)
+spec/ruby/core/nil/nil_spec.rb
+
+spec/ruby/core/hash/shift_spec.rb

src/main/java/org/truffleruby/language/arguments/ArgumentDescriptorUtils.java

@@ -19,6 +19,7 @@
 import org.truffleruby.parser.ArgumentType;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import org.truffleruby.parser.parser.ParserSupport;
 
 public class ArgumentDescriptorUtils {
 
@@ -48,7 +49,7 @@ private static RubyArray toArray(RubyLanguage language, RubyContext context, Arg
             store = new Object[]{ language.getSymbol(argType.symbolicName) };
         } else {
             // make sure to normalize parameter names to "_" if they start with "_$"
-            if (name.startsWith("_$")) {
+            if (name.startsWith(ParserSupport.UNDERSCORE_PREFIX)) {
                 name = "_";
             }
 

src/main/java/org/truffleruby/parser/parser/ParserSupport.java

@@ -160,6 +160,8 @@ public class ParserSupport {
     public static final String FORWARD_ARGS_BLOCK_VAR = Layouts.TEMP_PREFIX + "forward_block";
     public static final TruffleString FORWARD_ARGS_BLOCK_VAR_TSTRING = TStringUtils
             .usAsciiString(FORWARD_ARGS_BLOCK_VAR);
+    /** A prefix for duplicated '_' local variables to build unique names */
+    public static final String UNDERSCORE_PREFIX = "_$";
 
     // Parser states:
     protected StaticScope currentScope;
@@ -1587,7 +1589,7 @@ public ArgumentParseNode arg_var(String string) {
         if (name == "_") {
             int count = 0;
             while (current.exists(name) >= 0) {
-                name = ("_$" + count++).intern();
+                name = (UNDERSCORE_PREFIX + count++).intern(); // e.g. _$1, _$2, etc
             }
         }