Adopt changes in Prism

eregon · eregon · commit 18ee9a25af9d · 2024-02-23T11:49:52.000+01:00
diff --git a/spec/truffle/parsing/fixtures/ensure/in_do_end_block.yaml b/spec/truffle/parsing/fixtures/ensure/in_do_end_block.yaml
@@ -69,8 +69,8 @@ ast: |
                                   EnsureNodeGen
                                       attributes:
                                           flags = 0
-                                          sourceCharIndex = 10
-                                          sourceLength = 22
+                                          sourceCharIndex = 5
+                                          sourceLength = 27
                                       children:
                                           ensurePart =
                                               RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/ensure/in_method.yaml b/spec/truffle/parsing/fixtures/ensure/in_method.yaml
@@ -78,8 +78,8 @@ ast: |
                                   EnsureNodeGen
                                       attributes:
                                           flags = 0
-                                          sourceCharIndex = 10
-                                          sourceLength = 22
+                                          sourceCharIndex = 0
+                                          sourceLength = 32
                                       children:
                                           ensurePart =
                                               RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/ensure/in_module.yaml b/spec/truffle/parsing/fixtures/ensure/in_module.yaml
@@ -87,8 +87,8 @@ ast: |
                                               EnsureNodeGen
                                                   attributes:
                                                       flags = 0
-                                                      sourceCharIndex = 13
-                                                      sourceLength = 22
+                                                      sourceCharIndex = 0
+                                                      sourceLength = 35
                                                   children:
                                                       ensurePart =
                                                           RubyCallNode
diff --git a/spec/truffle/parsing/fixtures/rescue/backtrace_optimization/enabled/when_local_variable_defined_in_outer_scope.yaml b/spec/truffle/parsing/fixtures/rescue/backtrace_optimization/enabled/when_local_variable_defined_in_outer_scope.yaml
@@ -72,8 +72,8 @@ ast: |
                                   TryNodeGen
                                       attributes:
                                           flags = 0
-                                          sourceCharIndex = 20
-                                          sourceLength = 22
+                                          sourceCharIndex = 15
+                                          sourceLength = 27
                                       children:
                                           rescueParts = [
                                               RescueStandardErrorNode
diff --git a/spec/truffle/parsing/fixtures/rescue/in_do_end_block.yaml b/spec/truffle/parsing/fixtures/rescue/in_do_end_block.yaml
@@ -69,8 +69,8 @@ ast: |
                                   TryNodeGen
                                       attributes:
                                           flags = 0
-                                          sourceCharIndex = 10
-                                          sourceLength = 21
+                                          sourceCharIndex = 5
+                                          sourceLength = 26
                                       children:
                                           rescueParts = [
                                               RescueStandardErrorNode
diff --git a/spec/truffle/parsing/fixtures/rescue/in_method.yaml b/spec/truffle/parsing/fixtures/rescue/in_method.yaml
@@ -78,8 +78,8 @@ ast: |
                                   TryNodeGen
                                       attributes:
                                           flags = 0
-                                          sourceCharIndex = 10
-                                          sourceLength = 21
+                                          sourceCharIndex = 0
+                                          sourceLength = 31
                                       children:
                                           rescueParts = [
                                               RescueStandardErrorNode
diff --git a/spec/truffle/parsing/fixtures/rescue/in_module.yaml b/spec/truffle/parsing/fixtures/rescue/in_module.yaml
@@ -87,8 +87,8 @@ ast: |
                                               TryNodeGen
                                                   attributes:
                                                       flags = 0
-                                                      sourceCharIndex = 13
-                                                      sourceLength = 21
+                                                      sourceCharIndex = 0
+                                                      sourceLength = 34
                                                   children:
                                                       rescueParts = [
                                                           RescueStandardErrorNode
diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
@@ -272,10 +272,9 @@ private static RubySource createRubySource(TStringWithEncoding code) {
         }
 
         private static ParseResult getParseResult(RubyLanguage language, RubySource rubySource) {
-            var yarpSource = YARPTranslatorDriver.createYARPSource(rubySource.getBytes());
             String sourcePath = rubySource.getSourcePath(language).intern();
 
-            return YARPTranslatorDriver.parseToYARPAST(rubySource, sourcePath, yarpSource,
+            return YARPTranslatorDriver.parseToYARPAST(rubySource, sourcePath, rubySource.getBytes(),
                     Collections.emptyList(), language.options.FROZEN_STRING_LITERALS);
         }
     }
diff --git a/src/main/java/org/truffleruby/parser/ParseEnvironment.java b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
@@ -26,7 +26,7 @@ public final class ParseEnvironment {
     public final RubySource rubySource;
     public final Source source;
     /** Used to compute line numbers */
-    public final Nodes.Source yarpSource;
+    public Nodes.Source yarpSource;
     public final ParserContext parserContext;
     public final Node currentNode;
 
@@ -40,13 +40,11 @@ public final class ParseEnvironment {
     public ParseEnvironment(
             RubyLanguage language,
             RubySource rubySource,
-            Nodes.Source yarpSource,
             ParserContext parserContext,
             Node currentNode) {
         this.language = language;
         this.rubySource = rubySource;
         this.source = rubySource.getSource();
-        this.yarpSource = yarpSource;
         this.parserContext = parserContext;
         this.currentNode = currentNode;
 
diff --git a/src/main/java/org/truffleruby/parser/YARPLoader.java b/src/main/java/org/truffleruby/parser/YARPLoader.java
@@ -37,7 +37,6 @@
 package org.truffleruby.parser;
 
 import org.prism.Loader;
-import org.prism.Nodes;
 import org.prism.ParseResult;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
@@ -47,14 +46,14 @@
 
 public final class YARPLoader extends Loader {
 
-    public static ParseResult load(byte[] serialized, Nodes.Source source, RubySource rubySource) {
-        return new YARPLoader(serialized, source, rubySource).load();
+    public static ParseResult load(byte[] serialized, byte[] sourceBytes, RubySource rubySource) {
+        return new YARPLoader(serialized, sourceBytes, rubySource).load();
     }
 
     private final RubyEncoding encoding;
 
-    public YARPLoader(byte[] serialized, Nodes.Source source, RubySource rubySource) {
-        super(serialized, source);
+    public YARPLoader(byte[] serialized, byte[] sourceBytes, RubySource rubySource) {
+        super(serialized, sourceBytes);
         this.encoding = rubySource.getEncoding();
     }
 
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -2505,6 +2505,11 @@ private ToSNode[] translateInterpolatedParts(Nodes.Node[] parts) {
         return children;
     }
 
+    @Override
+    public RubyNode visitItParametersNode(Nodes.ItParametersNode node) {
+        throw CompilerDirectives.shouldNotReachHere("ItParametersNode is only from Ruby 3.4");
+    }
+
     @Override
     public RubyNode visitKeywordHashNode(Nodes.KeywordHashNode node) {
         // translate it like a HashNode, whether it is keywords or not is checked in getKeywordArgumentsDescriptor()
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -104,8 +104,8 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode, ParseResult parseResult) {
-        Nodes.Source yarpSource = createYARPSource(rubySource.getBytes());
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, yarpSource, parserContext, currentNode);
+        byte[] sourceBytes = rubySource.getBytes();
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
 
         assert rubySource.isEval() == parserContext.isEval();
 
@@ -165,18 +165,20 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
             parseResult = context.getMetricsProfiler().callWithMetrics(
                     "parsing",
                     source.getName(),
-                    () -> parseToYARPAST(rubySource, sourcePath, yarpSource, localsInScopes,
+                    () -> parseToYARPAST(rubySource, sourcePath, sourceBytes, localsInScopes,
                             language.options.FROZEN_STRING_LITERALS));
             printParseTranslateExecuteMetric("after-parsing", context, source);
         }
 
+        parseEnvironment.yarpSource = parseResult.source;
+
         handleWarningsErrorsPrimitives(context, parseResult, rubySource, sourcePath, parseEnvironment, rubyWarnings);
 
         var node = parseResult.value;
 
-        final SourceSection sourceSection = rubySource.getBytes().length == 0
+        final SourceSection sourceSection = sourceBytes.length == 0
                 ? source.createUnavailableSection()
-                : source.createSection(0, rubySource.getBytes().length);
+                : source.createSection(0, sourceBytes.length);
 
         final String modulePath = staticLexicalScope == null || staticLexicalScope == context.getRootLexicalScope()
                 ? null
@@ -350,11 +352,10 @@ private String getMethodName(ParserContext parserContext, MaterializedFrame pare
         }
     }
 
-    public static ParseResult parseToYARPAST(RubySource rubySource, String sourcePath, Nodes.Source yarpSource,
+    public static ParseResult parseToYARPAST(RubySource rubySource, String sourcePath, byte[] sourceBytes,
             List<List<String>> localsInScopes, boolean frozenStringLiteral) {
         TruffleSafepoint.poll(DummyNode.INSTANCE);
 
-        byte[] sourceBytes = rubySource.getBytes();
         final byte[] filepath = sourcePath.getBytes(Encodings.FILESYSTEM_CHARSET);
         int line = rubySource.getLineOffset() + 1;
         byte[] encoding = StringOperations.encodeAsciiBytes(rubySource.getEncoding().toString()); // encoding name is supposed to contain only ASCII characters
@@ -391,7 +392,7 @@ public static ParseResult parseToYARPAST(RubySource rubySource, String sourcePat
                 scopes);
         byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes, parsingOptions);
 
-        return YARPLoader.load(serializedBytes, yarpSource, rubySource);
+        return YARPLoader.load(serializedBytes, sourceBytes, rubySource);
     }
 
     public static void handleWarningsErrorsPrimitives(RubyContext context, ParseResult parseResult,
@@ -451,10 +452,6 @@ public static void handleWarningsErrorsPrimitives(RubyContext context, ParseResu
         parseEnvironment.allowTruffleRubyPrimitives = allowTruffleRubyPrimitives;
     }
 
-    public static Nodes.Source createYARPSource(byte[] sourceBytes) {
-        return new Nodes.Source(sourceBytes);
-    }
-
     private TranslatorEnvironment environmentForFrame(RubyContext context, MaterializedFrame frame, int blockDepth) {
         if (frame == null) {
             return null;
diff --git a/test/mri/tests/ruby/test_parse.rb b/test/mri/tests/ruby/test_parse.rb
@@ -377,10 +377,10 @@ def test_dsym
 
   def assert_disallowed_variable(type, noname, invalid)
     noname.each do |name|
-      assert_syntax_error("proc{a = #{name} }", /`#{noname[0]}' without identifiers is not allowed as #{type} variable name|invalid global variable/)
+      assert_syntax_error("proc{a = #{name} }", /`#{Regexp.escape noname[0]}' without identifiers is not allowed as #{type} variable name|`#{Regexp.escape noname[0]}' is not allowed as #{type} variable name/)
     end
     invalid.each do |name|
-      assert_syntax_error("proc {a = #{name} }", /`#{name}' is not allowed as #{type} variable name|invalid global variable/)
+      assert_syntax_error("proc {a = #{name} }", /`#{Regexp.escape name}' is not allowed as #{type} variable name|`#{Regexp.escape noname[0]}' is not allowed as #{type} variable name/)
     end
   end
 

Original file line number	Diff line number	Diff line change
`@@ -272,10 +272,9 @@ private static RubySource createRubySource(TStringWithEncoding code) {`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`private static ParseResult getParseResult(RubyLanguage language, RubySource rubySource) {`
`275`		`- var yarpSource = YARPTranslatorDriver.createYARPSource(rubySource.getBytes());`
`276`	`275`	`String sourcePath = rubySource.getSourcePath(language).intern();`
`277`	`276`
`278`		`- return YARPTranslatorDriver.parseToYARPAST(rubySource, sourcePath, yarpSource,`
	`277`	`+ return YARPTranslatorDriver.parseToYARPAST(rubySource, sourcePath, rubySource.getBytes(),`
`279`	`278`	`Collections.emptyList(), language.options.FROZEN_STRING_LITERALS);`
`280`	`279`	`}`
`281`	`280`	`}`