Inspect RubyRootNode for warnings during syntax check

bjfish · bjfish · commit b62663c581d1 · 2021-03-15T12:35:15.000-05:00
diff --git a/spec/tags/language/numbered_parameters_tags.txt b/spec/tags/language/numbered_parameters_tags.txt
@@ -0,0 +1 @@
+fails:Numbered parameters warns when numbered parameter is overwritten with local variable
diff --git a/src/main/java/org/truffleruby/language/EmitWarningsNode.java b/src/main/java/org/truffleruby/language/EmitWarningsNode.java
@@ -24,7 +24,7 @@
 
 public class EmitWarningsNode extends RubyContextSourceNode {
 
-    private final RubyDeferredWarnings warnings;
+    public final RubyDeferredWarnings warnings;
 
     public EmitWarningsNode(RubyDeferredWarnings warnings) {
         this.warnings = warnings;
@@ -33,28 +33,38 @@ public EmitWarningsNode(RubyDeferredWarnings warnings) {
     @Override
     public Object execute(VirtualFrame frame) {
         final RubyContext context = getContext();
-        boolean isVerbose = context.getCoreLibrary().isVerbose();
-        boolean warningsEnabled = context.getCoreLibrary().warningsEnabled();
-        printWarnings(context, isVerbose, warningsEnabled);
+        printWarnings(context);
         return nil;
     }
 
+    public void printWarnings(RubyContext context) {
+        printWarnings(context, warnings);
+    }
+
     @TruffleBoundary
-    private void printWarnings(RubyContext context, boolean isVerbose, boolean warningsEnabled) {
-        for (RubyDeferredWarnings.WarningMessage warningMessage : warnings.warnings) {
-            if (warningMessage.verbosity == RubyDeferredWarnings.Verbosity.VERBOSE) {
-                if (isVerbose) {
-                    printWarning(context, warningMessage.message);
-                }
-            } else {
-                if (warningsEnabled) {
-                    printWarning(context, warningMessage.message);
+    public static void printWarnings(RubyContext context, RubyDeferredWarnings warnings) {
+        if (context == null) {
+            for (RubyDeferredWarnings.WarningMessage warningMessage : warnings.warnings) {
+                System.err.println(warningMessage.message);
+            }
+        } else {
+            boolean isVerbose = context.getCoreLibrary().isVerbose();
+            boolean warningsEnabled = context.getCoreLibrary().warningsEnabled();
+            for (RubyDeferredWarnings.WarningMessage warningMessage : warnings.warnings) {
+                if (warningMessage.verbosity == RubyDeferredWarnings.Verbosity.VERBOSE) {
+                    if (isVerbose) {
+                        printWarning(context, warningMessage.message);
+                    }
+                } else {
+                    if (warningsEnabled) {
+                        printWarning(context, warningMessage.message);
+                    }
                 }
             }
         }
     }
 
-    public static void printWarning(RubyContext context, String message) {
+    private static void printWarning(RubyContext context, String message) {
         if (context.getCoreLibrary().isLoaded()) {
             final Object warning = context.getCoreLibrary().warningModule;
             final Rope messageRope = StringOperations.encodeRope(message, UTF8Encoding.INSTANCE);
@@ -63,7 +73,7 @@ public static void printWarning(RubyContext context, String message) {
             RubyContext.send(warning, "warn", messageString);
         } else {
             try {
-                context.getEnv().err().write(message.getBytes(StandardCharsets.UTF_8));
+                context.getEnvErrStream().write(message.getBytes(StandardCharsets.UTF_8));
             } catch (IOException e) {
                 throw new RaiseException(context, context.getCoreExceptions().ioError(e, null));
             }
diff --git a/src/main/java/org/truffleruby/language/TruffleBootNodes.java b/src/main/java/org/truffleruby/language/TruffleBootNodes.java
@@ -15,6 +15,7 @@
 import java.util.stream.Collectors;
 
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.NodeUtil;
 import org.graalvm.options.OptionDescriptor;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.RubyContext;
@@ -288,8 +289,14 @@ public abstract static class InnerCheckSyntaxNode extends CoreMethodArrayArgumen
         @TruffleBoundary
         @Specialization
         protected Object innerCheckSyntax(RubySource source) {
-            getContext().getCodeLoader().parse(source, ParserContext.TOP_LEVEL, null, null, true, null);
-
+            RubyContext context = getContext();
+            RubyRootNode rubyRootNode = context
+                    .getCodeLoader()
+                    .parse(source, ParserContext.TOP_LEVEL, null, null, true, null);
+            EmitWarningsNode emitWarningsNode = NodeUtil.findFirstNodeInstance(rubyRootNode, EmitWarningsNode.class);
+            if (emitWarningsNode != null) {
+                emitWarningsNode.printWarnings(context);
+            }
             return nil;
         }
 
diff --git a/src/main/java/org/truffleruby/language/methods/CatchForMethodNode.java b/src/main/java/org/truffleruby/language/methods/CatchForMethodNode.java
@@ -55,6 +55,10 @@ public Object execute(VirtualFrame frame) {
         }
     }
 
+    public RubyNode getBody() {
+        return body;
+    }
+
     @Override
     public RubyNode simplifyAsTailExpression() {
         return new CatchForMethodNode(returnID, body.simplifyAsTailExpression()).copySourceSection(this);
diff --git a/src/main/java/org/truffleruby/language/methods/CatchNextNode.java b/src/main/java/org/truffleruby/language/methods/CatchNextNode.java
@@ -26,6 +26,10 @@ public CatchNextNode(RubyNode body) {
         this.body = body;
     }
 
+    public RubyNode getBody() {
+        return body;
+    }
+
     @Override
     public Object execute(VirtualFrame frame) {
         try {
diff --git a/src/main/java/org/truffleruby/language/methods/CatchRetryAsErrorNode.java b/src/main/java/org/truffleruby/language/methods/CatchRetryAsErrorNode.java
@@ -37,4 +37,8 @@ public Object execute(VirtualFrame frame) {
         }
     }
 
+    public RubyNode getBody() {
+        return body;
+    }
+
 }
diff --git a/src/main/java/org/truffleruby/language/methods/ExceptionTranslatingNode.java b/src/main/java/org/truffleruby/language/methods/ExceptionTranslatingNode.java
@@ -40,6 +40,10 @@ public Object execute(VirtualFrame frame) {
         }
     }
 
+    public RubyNode getChild() {
+        return child;
+    }
+
     @Override
     public RubyNode simplifyAsTailExpression() {
         return new ExceptionTranslatingNode(child.simplifyAsTailExpression(), unsupportedOperationBehavior)
diff --git a/src/main/java/org/truffleruby/parser/TranslatorDriver.java b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
@@ -302,12 +302,6 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
                     Arrays.asList(BodyTranslator.initFlipFlopStates(environment, sourceIndexLength), truffleNode));
         }
 
-        if (!rubyWarnings.warnings.isEmpty()) {
-            truffleNode = Translator.sequence(
-                    sourceIndexLength,
-                    Arrays.asList(new EmitWarningsNode(rubyWarnings), truffleNode));
-        }
-
         if (parserContext == ParserContext.TOP_LEVEL_FIRST && context.getOptions().GETS_LOOP) {
             if (context.getOptions().PRINT_LOOP) {
                 truffleNode = Translator.sequence(
@@ -334,9 +328,16 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
                     Arrays.asList(beginNode, truffleNode));
         }
 
+
         final RubyNode writeSelfNode = Translator.loadSelf(language, environment);
         truffleNode = Translator.sequence(sourceIndexLength, Arrays.asList(writeSelfNode, truffleNode));
 
+        if (!rubyWarnings.warnings.isEmpty()) {
+            truffleNode = Translator.sequence(
+                    sourceIndexLength,
+                    Arrays.asList(new EmitWarningsNode(rubyWarnings), truffleNode));
+        }
+
         // Catch next
 
         truffleNode = new CatchNextNode(truffleNode);
@@ -416,11 +417,7 @@ public static RootParseNode parseToJRubyAST(RubyContext context, RubySource ruby
             result = parser.parse(configuration);
         } catch (SyntaxException e) {
             if (!rubyWarnings.warnings.isEmpty()) {
-                if (context != null) {
-                    for (RubyDeferredWarnings.WarningMessage warningMessage : rubyWarnings.warnings) {
-                        EmitWarningsNode.printWarning(context, warningMessage.message);
-                    }
-                }
+                EmitWarningsNode.printWarnings(context, rubyWarnings);
             }
             switch (e.getPid()) {
                 case UNKNOWN_ENCODING:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+fails:Numbered parameters warns when numbered parameter is overwritten with local variable`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ public Object execute(VirtualFrame frame) {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ public RubyNode getBody() {`
	`59`	`+ return body;`
	`60`	`+ }`
	`61`	`+`
`58`	`62`	`@Override`
`59`	`63`	`public RubyNode simplifyAsTailExpression() {`
`60`	`64`	`return new CatchForMethodNode(returnID, body.simplifyAsTailExpression()).copySourceSection(this);`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,8 @@ public Object execute(VirtualFrame frame) {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public RubyNode getBody() {`
	`41`	`+ return body;`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public Object execute(VirtualFrame frame) {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ public RubyNode getChild() {`
	`44`	`+ return child;`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`@Override`
`44`	`48`	`public RubyNode simplifyAsTailExpression() {`
`45`	`49`	`return new ExceptionTranslatingNode(child.simplifyAsTailExpression(), unsupportedOperationBehavior)`