Repair passing additional arguments to Prism

Author: andrykonchin

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

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
@@ -110,6 +111,7 @@
 import org.truffleruby.parser.RubySource;
 import org.truffleruby.parser.TranslatorEnvironment;
 import org.truffleruby.parser.YARPTranslatorDriver;
+import org.truffleruby.shared.TruffleRuby;
 
 @CoreModule("Truffle::Debug")
 public abstract class TruffleDebugNodes {
@@ -1369,4 +1371,37 @@ private RubyRootNode parse(TStringWithEncoding sourceCode, boolean mainScript) {
         }
     }
 
+    @CoreMethod(names = "parse_public", onSingleton = true, required = 3)
+    @ImportStatic(ArrayGuards.class)
+    public abstract static class ParsePublicNode extends CoreMethodArrayArgumentsNode {
+
+        @TruffleBoundary
+        @Specialization(limit = "storageStrategyLimit()")
+        Object parsePublic(Object sourceCode, RubyArray parameters, RubyArray arguments,
+                @Bind("parameters.getStore()") Object parametersStore,
+                @Bind("arguments.getStore()") Object argumentsStore,
+                @CachedLibrary("parametersStore") ArrayStoreLibrary parametersStores,
+                @CachedLibrary("argumentsStore") ArrayStoreLibrary argumentsStores) {
+            String sourceCodeString = RubyGuards.getJavaString(sourceCode);
+
+            String[] names = new String[parameters.size];
+            Object[] values = new Object[arguments.size];
+
+            for (int i = 0; i < names.length; i++) {
+                Object name = parametersStores.read(parametersStore, i);
+                names[i] = RubyGuards.getJavaString(name);
+            }
+
+            for (int i = 0; i < values.length; i++) {
+                values[i] = argumentsStores.read(argumentsStore, i);
+            }
+
+            Source source = Source.newBuilder(TruffleRuby.LANGUAGE_ID, sourceCodeString, "parse_public.rb").build();
+            var env = getContext().getEnv();
+
+            CallTarget method = env.parsePublic(source, names);
+            return method.call(values);
+        }
+    }
+
 }

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

@@ -123,7 +123,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
          * we look them up ourselves after being told they're in some parent scope. */
 
         final TranslatorEnvironment parentEnvironment;
-        final List<List<String>> localVariableNames = new ArrayList<>();
+        final List<List<String>> localsInScopes = new ArrayList<>();
 
         int blockDepth = 0;
         if (parentFrame != null) {
@@ -139,7 +139,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
                     }
                 }
 
-                localVariableNames.add(names);
+                localsInScopes.add(names);
                 frame = RubyArguments.getDeclarationFrame(frame);
                 blockDepth++;
             }
@@ -150,7 +150,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
         }
 
         if (argumentNames != null) {
-            // TODO: add these variables and treat it more like an eval case
+            localsInScopes.add(Arrays.asList(argumentNames));
         }
 
         // Parse to the YARP AST
@@ -168,7 +168,7 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
             parseResult = context.getMetricsProfiler().callWithMetrics(
                     "parsing",
                     source.getName(),
-                    () -> parseToYARPAST(language, rubySource, localVariableNames,
+                    () -> parseToYARPAST(language, rubySource, localsInScopes,
                             parseEnvironment));
             printParseTranslateExecuteMetric("after-parsing", context, source);
         }
@@ -356,25 +356,23 @@ private String getMethodName(ParserContext parserContext, MaterializedFrame pare
     }
 
     public static ParseResult parseToYARPAST(RubyLanguage language, RubySource rubySource,
-            List<List<String>> localVariableNames, ParseEnvironment parseEnvironment) {
+            List<List<String>> localsInScopes, ParseEnvironment parseEnvironment) {
         TruffleSafepoint.poll(DummyNode.INSTANCE);
 
-        byte[] sourceBytes = rubySource.getBytes();
+        // intern() to improve footprint
+        String sourcePath = rubySource.getSourcePath(language).intern();
 
-        byte[] filepath;
+        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
         boolean frozenStringLiteral = language.options.FROZEN_STRING_LITERALS;
         var version = ParsingOptions.SyntaxVersion.V3_3_0;
-        byte[][][] scopes;
 
-        // intern() to improve footprint
-        String sourcePath = rubySource.getSourcePath(language).intern();
-
-        if (rubySource.isEval()) {
-            filepath = sourcePath.getBytes(Encodings.FILESYSTEM_CHARSET);
+        byte[][][] scopes;
 
-            int scopesCount = localVariableNames.size();
+        if (!localsInScopes.isEmpty()) {
+            int scopesCount = localsInScopes.size();
             // Add one empty extra scope at the end to have local variables treated by Prism
             // as declared in the outer scope.
             // See https://github.com/ruby/prism/issues/2327 and https://github.com/ruby/prism/issues/2192
@@ -383,7 +381,7 @@ public static ParseResult parseToYARPAST(RubyLanguage language, RubySource rubyS
             for (int i = 0; i < scopesCount; i++) {
                 // Local variables are in order from inner scope to outer one, but Prism expects order from outer to inner.
                 // So we need to reverse the order
-                var namesList = localVariableNames.get(scopesCount - 1 - i);
+                var namesList = localsInScopes.get(scopesCount - 1 - i);
                 byte[][] namesBytes = new byte[namesList.size()][];
                 int j = 0;
                 for (var name : namesList) {
@@ -395,9 +393,6 @@ public static ParseResult parseToYARPAST(RubyLanguage language, RubySource rubyS
 
             scopes[scopes.length - 1] = new byte[][]{};
         } else {
-            assert localVariableNames.isEmpty(); // parsing of the whole source file cannot have outer scopes
-
-            filepath = sourcePath.getBytes(Encodings.FILESYSTEM_CHARSET);
             scopes = new byte[0][][];
         }
 

src/test-embedding/java/org/truffleruby/test/embedding/PolyglotInteropTest.java

@@ -40,6 +40,13 @@ public void testParameters() {
         }
     }
 
+    @Test
+    public void testExecutingWithParameters() {
+        try (Context polyglot = Context.create()) {
+            assertEquals(3, polyglot.eval("ruby", "Truffle::Debug.parse_public 'a + b', ['a', 'b'], [1, 2]").asInt());
+        }
+    }
+
     @Test
     public void testCallingMethods() {
         try (Context polyglot = Context.create()) {