Use Prism magic comments in YARPTranslatorDriver

mushfiqur47 · Nov 22, 2023 · 953df20 · 953df20
1 parent 6277b08
commit 953df20
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -166,12 +166,6 @@ public RootCallTarget parse(RubySource rubySource, ParserContext parserContext,
             parserConfiguration.setFrozenStringLiteral(true);
         }
 
-        RubyLexer.parseMagicComment(rubySource.getTStringWithEncoding(), (name, value) -> {
-            if (RubyLexer.isMagicTruffleRubyPrimitivesComment(name)) {
-                parserConfiguration.allowTruffleRubyPrimitives = value.equalsIgnoreCase("true");
-            }
-        });
-
         // Parse to the YARP AST
 
         final org.prism.Nodes.Node node;
@@ -456,6 +450,17 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu
             }
         }
 
+        for (var magicComment : parseResult.magicComments) {
+            String name = rubySource.getTStringWithEncoding()
+                    .substring(magicComment.keyLocation.startOffset, magicComment.keyLocation.length).toJavaString();
+            String value = rubySource.getTStringWithEncoding()
+                    .substring(magicComment.valueLocation.startOffset, magicComment.valueLocation.length)
+                    .toJavaString();
+            if (RubyLexer.isMagicTruffleRubyPrimitivesComment(name)) {
+                configuration.allowTruffleRubyPrimitives = value.equalsIgnoreCase("true");
+            }
+        }
+
         return parseResult.value;
         // YARP end