Replace the last usages of TranslatorDriver

Author: eregon

src/main/java/org/truffleruby/RubyContext.java

@@ -78,7 +78,7 @@
 import org.truffleruby.language.objects.shared.SharedObjects;
 import org.truffleruby.options.LanguageOptions;
 import org.truffleruby.options.Options;
-import org.truffleruby.parser.TranslatorDriver;
+import org.truffleruby.parser.YARPTranslatorDriver;
 import org.truffleruby.platform.NativeConfiguration;
 import org.truffleruby.platform.Signals;
 import org.truffleruby.platform.TruffleNFIPlatform;
@@ -335,10 +335,10 @@ protected boolean patch(Env newEnv) {
                     .getSharedMethodInfo()
                     .getSourceSection()
                     .getSource();
-            TranslatorDriver.printParseTranslateExecuteMetric("before-run-delayed-initialization", this, source);
+            YARPTranslatorDriver.printParseTranslateExecuteMetric("before-run-delayed-initialization", this, source);
             ProcOperations.rootCall((RubyProc) proc, NoKeywordArgumentsDescriptor.INSTANCE,
                     RubyBaseNode.EMPTY_ARGUMENTS);
-            TranslatorDriver.printParseTranslateExecuteMetric("after-run-delayed-initialization", this, source);
+            YARPTranslatorDriver.printParseTranslateExecuteMetric("after-run-delayed-initialization", this, source);
         }
         Metrics.printTime("after-run-delayed-initialization");
 

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -63,7 +63,7 @@
 import org.truffleruby.language.objects.SingletonClassNode;
 import org.truffleruby.parser.ParserContext;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.TranslatorDriver;
+import org.truffleruby.parser.YARPTranslatorDriver;
 import org.truffleruby.platform.NativeConfiguration;
 import org.truffleruby.platform.NativeTypes;
 import org.truffleruby.shared.BuildInformationImpl;
@@ -770,9 +770,9 @@ public void loadRubyCoreLibraryAndPostBoot() {
                         context.getCoreLibrary().mainObject,
                         context.getRootLexicalScope());
 
-                TranslatorDriver.printParseTranslateExecuteMetric("before-execute", context, source);
+                YARPTranslatorDriver.printParseTranslateExecuteMetric("before-execute", context, source);
                 deferredCall.callWithoutCallNode();
-                TranslatorDriver.printParseTranslateExecuteMetric("after-execute", context, source);
+                YARPTranslatorDriver.printParseTranslateExecuteMetric("after-execute", context, source);
             }
         } catch (IOException e) {
             throw CompilerDirectives.shouldNotReachHere(e);

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

@@ -107,14 +107,11 @@
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.utilities.TriState;
+import org.truffleruby.parser.ParseEnvironment;
 import org.truffleruby.parser.ParserContext;
-import org.truffleruby.parser.RubyDeferredWarnings;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.TranslatorDriver;
 import org.truffleruby.parser.TranslatorEnvironment;
 import org.truffleruby.parser.YARPTranslatorDriver;
-import org.truffleruby.parser.parser.ParserConfiguration;
-import org.truffleruby.parser.scope.StaticScope;
 import org.prism.Loader;
 import org.prism.Parser;
 
@@ -343,13 +340,14 @@ Object ast(Object code,
             var source = Source.newBuilder("ruby", new ByteBasedCharSequence(codeString), name).build();
             var rubySource = new RubySource(source, name);
 
-            var staticScope = new StaticScope(StaticScope.Type.LOCAL, null);
-            var parserConfiguration = new ParserConfiguration(null, false, true, false);
-            var rubyWarnings = new RubyDeferredWarnings();
-            var rootParseNode = TranslatorDriver
-                    .parseToJRubyAST(getContext(), rubySource, staticScope, parserConfiguration, rubyWarnings);
+            var yarpSource = YARPTranslatorDriver.createYARPSource(rubySource.getBytes());
+            var parseEnvironment = new ParseEnvironment(getLanguage(), rubySource, yarpSource, ParserContext.TOP_LEVEL,
+                    this);
 
-            return createString(fromJavaStringNode, rootParseNode.toString(), Encodings.UTF_8);
+            var parseResult = YARPTranslatorDriver.parseToYARPAST(getLanguage(), rubySource, Collections.emptyList(),
+                    parseEnvironment);
+
+            return createString(fromJavaStringNode, parseResult.value.toString(), Encodings.UTF_8);
         }
     }
 

src/main/java/org/truffleruby/language/RubyInlineParsingRequestNode.java

@@ -19,7 +19,6 @@
 import org.truffleruby.language.methods.SharedMethodInfo;
 import org.truffleruby.parser.ParserContext;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.TranslatorDriver;
 
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
@@ -28,6 +27,7 @@
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.ExecutableNode;
 import com.oracle.truffle.api.source.Source;
+import org.truffleruby.parser.YARPTranslatorDriver;
 
 public final class RubyInlineParsingRequestNode extends ExecutableNode {
 
@@ -47,7 +47,7 @@ public RubyInlineParsingRequestNode(
         final RubySource rubySource = new RubySource(source, language.getSourcePath(source), null, true, 0);
 
         // We use the current frame as the lexical scope to parse, but then we may run with a new frame in the future
-        final TranslatorDriver translator = new TranslatorDriver(context);
+        final YARPTranslatorDriver translator = new YARPTranslatorDriver(context);
         final RootCallTarget callTarget = translator.parse(
                 rubySource,
                 ParserContext.INLINE,

src/main/java/org/truffleruby/language/RubyParsingRequestNode.java

@@ -21,7 +21,7 @@
 import org.truffleruby.language.objects.shared.SharedObjects;
 import org.truffleruby.parser.ParserContext;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.TranslatorDriver;
+import org.truffleruby.parser.YARPTranslatorDriver;
 import org.truffleruby.shared.Metrics;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -42,7 +42,7 @@ public RubyParsingRequestNode(RubyLanguage language, RubyContext context, Source
 
         final RubySource rubySource = new RubySource(source, language.getSourcePath(source));
 
-        final TranslatorDriver translator = new TranslatorDriver(context);
+        final YARPTranslatorDriver translator = new YARPTranslatorDriver(context);
         callTarget = translator.parse(
                 rubySource,
                 ParserContext.TOP_LEVEL,

src/main/java/org/truffleruby/language/loader/CodeLoader.java

@@ -26,7 +26,6 @@
 import org.truffleruby.parser.ParserContext;
 import org.truffleruby.parser.ParsingParameters;
 import org.truffleruby.parser.RubySource;
-import org.truffleruby.parser.TranslatorDriver;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
@@ -77,7 +76,7 @@ public RootCallTarget parse(RubySource source,
             MaterializedFrame parentFrame,
             LexicalScope lexicalScope,
             Node currentNode) {
-        final TranslatorDriver translator = new TranslatorDriver(context);
+        final YARPTranslatorDriver translator = new YARPTranslatorDriver(context);
         return translator.parse(source, parserContext, null, parentFrame, lexicalScope, currentNode);
     }