Move fileLine and filenameLine to RubyLanguage

bjfish · bjfish · commit f1defbf20921 · 2021-03-17T17:15:44.000-05:00
diff --git a/src/main/java/org/truffleruby/RubyContext.java b/src/main/java/org/truffleruby/RubyContext.java
@@ -93,7 +93,6 @@
 import com.oracle.truffle.api.instrumentation.Instrumenter;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.source.Source;
-import com.oracle.truffle.api.source.SourceSection;
 
 public class RubyContext {
 
@@ -825,35 +824,4 @@ public PrintStream getEnvErrStream() {
         return errStream;
     }
 
-    @TruffleBoundary
-    public static String fileLine(SourceSection section) {
-        if (section == null) {
-            return "no source section";
-        } else {
-            final String path = RubyLanguage.getPath(section.getSource());
-
-            if (section.isAvailable()) {
-                return path + ":" + section.getStartLine();
-            } else {
-                return path;
-            }
-        }
-    }
-
-    @TruffleBoundary
-    public static String filenameLine(SourceSection section) {
-        if (section == null) {
-            return "no source section";
-        } else {
-            final String path = RubyLanguage.getPath(section.getSource());
-            final String filename = new File(path).getName();
-
-            if (section.isAvailable()) {
-                return filename + ":" + section.getStartLine();
-            } else {
-                return filename;
-            }
-        }
-    }
-
 }
diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -21,6 +21,7 @@
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.api.source.SourceSection;
 import org.graalvm.options.OptionDescriptors;
 import org.jcodings.Encoding;
 import org.truffleruby.builtins.PrimitiveManager;
@@ -235,6 +236,37 @@ public RubyLanguage() {
         frozenStringLiterals = new FrozenStringLiterals(ropeCache);
     }
 
+    @TruffleBoundary
+    public static String fileLine(SourceSection section) {
+        if (section == null) {
+            return "no source section";
+        } else {
+            final String path = getPath(section.getSource());
+
+            if (section.isAvailable()) {
+                return path + ":" + section.getStartLine();
+            } else {
+                return path;
+            }
+        }
+    }
+
+    @TruffleBoundary
+    public static String filenameLine(SourceSection section) {
+        if (section == null) {
+            return "no source section";
+        } else {
+            final String path = getPath(section.getSource());
+            final String filename = new File(path).getName();
+
+            if (section.isAvailable()) {
+                return filename + ":" + section.getStartLine();
+            } else {
+                return filename;
+            }
+        }
+    }
+
     @TruffleBoundary
     public RubySymbol getSymbol(String string) {
         return symbolTable.getSymbol(string);
diff --git a/src/main/java/org/truffleruby/builtins/PrimitiveNodeConstructor.java b/src/main/java/org/truffleruby/builtins/PrimitiveNodeConstructor.java
@@ -9,7 +9,7 @@
  */
 package org.truffleruby.builtins;
 
-import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.numeric.FixnumLowerNodeGen;
 import org.truffleruby.core.support.TypeNodes;
@@ -39,7 +39,7 @@ public RubyNode createInvokePrimitiveNode(Source source, SourceIndexLength sourc
         if (arguments.length != getPrimitiveArity()) {
             throw new Error(
                     "Incorrect number of arguments (expected " + getPrimitiveArity() + ") at " +
-                            RubyContext.fileLine(sourceSection.toSourceSection(source)));
+                            RubyLanguage.fileLine(sourceSection.toSourceSection(source)));
         }
 
         for (int n = 0; n < arguments.length; n++) {
diff --git a/src/main/java/org/truffleruby/core/fiber/FiberManager.java b/src/main/java/org/truffleruby/core/fiber/FiberManager.java
@@ -145,7 +145,7 @@ private void fiberMain(RubyContext context, RubyFiber fiber, RubyProc block, Nod
         final Thread thread = Thread.currentThread();
         final SourceSection sourceSection = block.sharedMethodInfo.getSourceSection();
         final String oldName = thread.getName();
-        thread.setName(NAME_PREFIX + " id=" + thread.getId() + " from " + RubyContext.fileLine(sourceSection));
+        thread.setName(NAME_PREFIX + " id=" + thread.getId() + " from " + RubyLanguage.fileLine(sourceSection));
 
         start(fiber, thread, false);
 
diff --git a/src/main/java/org/truffleruby/core/module/ModuleFields.java b/src/main/java/org/truffleruby/core/module/ModuleFields.java
@@ -365,7 +365,7 @@ public void setAutoloadConstant(RubyContext context, Node currentNode, String na
         if (context.getOptions().LOG_AUTOLOAD) {
             RubyLanguage.LOGGER.info(() -> String.format(
                     "%s: setting up autoload %s with %s",
-                    RubyContext.fileLine(context.getCallStack().getTopMostUserSourceSection()),
+                    RubyLanguage.fileLine(context.getCallStack().getTopMostUserSourceSection()),
                     autoloadConstant,
                     filename));
         }
diff --git a/src/main/java/org/truffleruby/core/thread/ThreadNodes.java b/src/main/java/org/truffleruby/core/thread/ThreadNodes.java
@@ -362,7 +362,7 @@ public abstract static class ThreadInitializeNode extends PrimitiveArrayArgument
         protected Object initialize(RubyThread thread, RubyArray arguments, RubyProc block,
                 @CachedLibrary("arguments.store") ArrayStoreLibrary stores) {
             final SourceSection sourceSection = block.sharedMethodInfo.getSourceSection();
-            final String info = RubyContext.fileLine(sourceSection);
+            final String info = RubyLanguage.fileLine(sourceSection);
             final int argSize = arguments.size;
             final Object[] args = stores.boxedCopyOfRange(arguments.store, 0, argSize);
             final String sharingReason = "creating Ruby Thread " + info;
diff --git a/src/main/java/org/truffleruby/language/NotOptimizedWarningNode.java b/src/main/java/org/truffleruby/language/NotOptimizedWarningNode.java
@@ -75,7 +75,7 @@ private void log(RubyContext context, String message) {
 
         final String displayedWarning = String.format(
                 "%s: %s",
-                RubyContext.fileLine(userSourceSection),
+                RubyLanguage.fileLine(userSourceSection),
                 message);
 
         if (DISPLAYED_WARNINGS.add(displayedWarning)) {
diff --git a/src/main/java/org/truffleruby/language/RubyContextSourceNode.java b/src/main/java/org/truffleruby/language/RubyContextSourceNode.java
@@ -130,6 +130,6 @@ public RubyArray createEmptyArray() {
 
     @Override
     public String toString() {
-        return super.toString() + " at " + RubyContext.fileLine(getSourceSection());
+        return super.toString() + " at " + RubyLanguage.fileLine(getSourceSection());
     }
 }
diff --git a/src/main/java/org/truffleruby/language/RubySourceNode.java b/src/main/java/org/truffleruby/language/RubySourceNode.java
@@ -35,7 +35,7 @@ public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext c
 
     @Override
     public String toString() {
-        return super.toString() + " at " + RubyContext.fileLine(getSourceSection());
+        return super.toString() + " at " + RubyLanguage.fileLine(getSourceSection());
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/WarnNode.java b/src/main/java/org/truffleruby/language/WarnNode.java
@@ -72,7 +72,7 @@ static void callWarn(RubyContext context, SourceSection sourceSection, String me
 
     @TruffleBoundary
     private static String buildWarningMessage(SourceSection sourceSection, String message) {
-        final String sourceLocation = sourceSection != null ? RubyContext.fileLine(sourceSection) + ": " : "";
+        final String sourceLocation = sourceSection != null ? RubyLanguage.fileLine(sourceSection) + ": " : "";
         return sourceLocation + "warning: " + message;
     }
 
diff --git a/src/main/java/org/truffleruby/language/constants/GetConstantNode.java b/src/main/java/org/truffleruby/language/constants/GetConstantNode.java
@@ -102,7 +102,7 @@ protected Object autoloadConstant(
             if (getContext().getOptions().LOG_AUTOLOAD) {
                 RubyLanguage.LOGGER.info(() -> String.format(
                         "%s: %s::%s is being treated as missing while loading %s",
-                        RubyContext.fileLine(getContext().getCallStack().getTopMostUserSourceSection()),
+                        RubyLanguage.fileLine(getContext().getCallStack().getTopMostUserSourceSection()),
                         module.fields.getName(),
                         name,
                         expandedPath));
@@ -113,7 +113,7 @@ protected Object autoloadConstant(
         if (getContext().getOptions().LOG_AUTOLOAD) {
             RubyLanguage.LOGGER.info(() -> String.format(
                     "%s: autoloading %s with %s",
-                    RubyContext.fileLine(getContext().getCallStack().getTopMostUserSourceSection()),
+                    RubyLanguage.fileLine(getContext().getCallStack().getTopMostUserSourceSection()),
                     autoloadConstant,
                     autoloadConstant.getAutoloadConstant().getAutoloadPath()));
         }
@@ -157,7 +157,7 @@ public static boolean autoloadUndefineConstantIfStillAutoload(RubyConstant autol
     public static void logAutoloadResult(RubyContext context, RubyConstant constant, boolean undefined) {
         if (context.getOptions().LOG_AUTOLOAD) {
             final SourceSection section = context.getCallStack().getTopMostUserSourceSection();
-            final String message = RubyContext.fileLine(section) + ": " + constant + " " +
+            final String message = RubyLanguage.fileLine(section) + ": " + constant + " " +
                     (undefined
                             ? "was marked as undefined as it was not assigned in "
                             : "was successfully autoloaded from ") +
diff --git a/src/main/java/org/truffleruby/language/control/WhileNode.java b/src/main/java/org/truffleruby/language/control/WhileNode.java
@@ -9,7 +9,7 @@
  */
 package org.truffleruby.language.control;
 
-import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.cast.BooleanCastNode;
 import org.truffleruby.core.cast.BooleanCastNodeGen;
 import org.truffleruby.language.RubyContextNode;
@@ -54,7 +54,7 @@ public WhileRepeatingBaseNode(RubyNode condition, RubyNode body) {
 
         @Override
         public String toString() {
-            return "while loop at " + RubyContext.filenameLine(getEncapsulatingSourceSection());
+            return "while loop at " + RubyLanguage.filenameLine(getEncapsulatingSourceSection());
         }
 
     }
diff --git a/src/main/java/org/truffleruby/language/exceptions/TryNode.java b/src/main/java/org/truffleruby/language/exceptions/TryNode.java
@@ -9,7 +9,7 @@
  */
 package org.truffleruby.language.exceptions;
 
-import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.thread.GetCurrentRubyThreadNode;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -133,7 +133,7 @@ private ThreadLocalGlobals getThreadLocalGlobals() {
 
     @TruffleBoundary
     private void printBacktraceOnRescue(RescueNode rescue, RaiseException exception) {
-        String info = "rescued at " + RubyContext.fileLine(
+        String info = "rescued at " + RubyLanguage.fileLine(
                 getContext().getCallStack().getTopMostUserSourceSection(rescue.getEncapsulatingSourceSection())) +
                 ":\n";
         getContext().getDefaultBacktraceFormatter().printRubyExceptionOnEnvStderr(info, exception.getException());
diff --git a/src/main/java/org/truffleruby/language/loader/FeatureLoader.java b/src/main/java/org/truffleruby/language/loader/FeatureLoader.java
@@ -263,7 +263,7 @@ private String findFeatureImpl(String feature) {
                 final SourceSection sourceSection = context.getCallStack().getTopMostUserSourceSection();
                 return String.format(
                         "starting search from %s for feature %s...",
-                        RubyContext.fileLine(sourceSection),
+                        RubyLanguage.fileLine(sourceSection),
                         originalFeature);
             });
 
diff --git a/src/main/java/org/truffleruby/language/loader/RequireNode.java b/src/main/java/org/truffleruby/language/loader/RequireNode.java
@@ -19,7 +19,6 @@
 import java.util.stream.Collectors;
 
 import com.oracle.truffle.api.library.CachedLibrary;
-import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.cast.BooleanCastNode;
@@ -111,7 +110,7 @@ private boolean requireConsideringAutoload(String feature, String expandedPath,
                 RubyLanguage.LOGGER
                         .info(() -> String.format(
                                 "%s: requiring %s which is registered as an autoload for %s",
-                                RubyContext.fileLine(getContext().getCallStack().getTopMostUserSourceSection()),
+                                RubyLanguage.fileLine(getContext().getCallStack().getTopMostUserSourceSection()),
                                 feature,
                                 info));
             }
diff --git a/src/main/java/org/truffleruby/language/objects/shared/SharedObjects.java b/src/main/java/org/truffleruby/language/objects/shared/SharedObjects.java
@@ -83,7 +83,7 @@ private static void shareContextRoots(RubyLanguage language, RubyContext context
     public static void shareDeclarationFrame(RubyLanguage language, RubyProc block) {
         if (language.options.SHARED_OBJECTS_DEBUG) {
             final SourceSection sourceSection = block.sharedMethodInfo.getSourceSection();
-            RubyLanguage.LOGGER.info("sharing decl frame of " + RubyContext.fileLine(sourceSection));
+            RubyLanguage.LOGGER.info("sharing decl frame of " + RubyLanguage.fileLine(sourceSection));
         }
 
         final Set<Object> objects = ObjectGraph.newObjectSet();
diff --git a/src/main/java/org/truffleruby/parser/BodyTranslator.java b/src/main/java/org/truffleruby/parser/BodyTranslator.java
@@ -1215,7 +1215,7 @@ private RubyNode getLexicalScopeModuleNode(String kind, SourceIndexLength source
         if (environment.isDynamicConstantLookup()) {
             if (language.options.LOG_DYNAMIC_CONSTANT_LOOKUP) {
                 RubyLanguage.LOGGER
-                        .info(() -> kind + " at " + RubyContext.fileLine(sourceSection.toSourceSection(source)));
+                        .info(() -> kind + " at " + RubyLanguage.fileLine(sourceSection.toSourceSection(source)));
             }
             return new DynamicLexicalScopeNode();
         } else {
@@ -1227,7 +1227,7 @@ private RubyNode getLexicalScopeNode(String kind, SourceIndexLength sourceSectio
         if (environment.isDynamicConstantLookup()) {
             if (language.options.LOG_DYNAMIC_CONSTANT_LOOKUP) {
                 RubyLanguage.LOGGER
-                        .info(() -> kind + " at " + RubyContext.fileLine(sourceSection.toSourceSection(source)));
+                        .info(() -> kind + " at " + RubyLanguage.fileLine(sourceSection.toSourceSection(source)));
             }
             return new GetDynamicLexicalScopeNode();
         } else {
@@ -1251,7 +1251,7 @@ public RubyNode visitConstNode(ConstParseNode node) {
             if (language.options.LOG_DYNAMIC_CONSTANT_LOOKUP) {
                 RubyLanguage.LOGGER.info(
                         () -> "dynamic constant lookup at " +
-                                RubyContext.fileLine(sourceSection.toSourceSection(source)));
+                                RubyLanguage.fileLine(sourceSection.toSourceSection(source)));
             }
             ret = new ReadConstantWithDynamicScopeNode(name);
         } else {
@@ -2810,7 +2810,7 @@ public RubyNode visitSClassNode(SClassParseNode node) {
                 if (language.options.LOG_DYNAMIC_CONSTANT_LOOKUP) {
                     RubyLanguage.LOGGER.info(
                             () -> "start dynamic constant lookup at " +
-                                    RubyContext.fileLine(sourceSection.toSourceSection(source)));
+                                    RubyLanguage.fileLine(sourceSection.toSourceSection(source)));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ public void setAutoloadConstant(RubyContext context, Node currentNode, String na`
`365`	`365`	`if (context.getOptions().LOG_AUTOLOAD) {`
`366`	`366`	`RubyLanguage.LOGGER.info(() -> String.format(`
`367`	`367`	`"%s: setting up autoload %s with %s",`
`368`		`- RubyContext.fileLine(context.getCallStack().getTopMostUserSourceSection()),`
	`368`	`+ RubyLanguage.fileLine(context.getCallStack().getTopMostUserSourceSection()),`
`369`	`369`	`autoloadConstant,`
`370`	`370`	`filename));`
`371`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,6 @@ public RubyArray createEmptyArray() {`
`130`	`130`
`131`	`131`	`@Override`
`132`	`132`	`public String toString() {`
`133`		`- return super.toString() + " at " + RubyContext.fileLine(getSourceSection());`
	`133`	`+ return super.toString() + " at " + RubyLanguage.fileLine(getSourceSection());`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext c`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public String toString() {`
`38`		`- return super.toString() + " at " + RubyContext.fileLine(getSourceSection());`
	`38`	`+ return super.toString() + " at " + RubyLanguage.fileLine(getSourceSection());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ static void callWarn(RubyContext context, SourceSection sourceSection, String me`
`72`	`72`
`73`	`73`	`@TruffleBoundary`
`74`	`74`	`private static String buildWarningMessage(SourceSection sourceSection, String message) {`
`75`		`- final String sourceLocation = sourceSection != null ? RubyContext.fileLine(sourceSection) + ": " : "";`
	`75`	`+ final String sourceLocation = sourceSection != null ? RubyLanguage.fileLine(sourceSection) + ": " : "";`
`76`	`76`	`return sourceLocation + "warning: " + message;`
`77`	`77`	`}`
`78`	`78`