Make a few more final fields of CoreLibrary public too

eregon · eregon · commit ff90e08c3144 · 2019-12-24T15:53:52.000+01:00
diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -277,7 +277,7 @@ protected Iterable<Scope> findLocalScopes(RubyContext context, Node node, Frame
 
     @Override
     protected Iterable<Scope> findTopScopes(RubyContext context) {
-        return Collections.singletonList(GlobalScope.getGlobalScope(context.getCoreLibrary().getGlobalVariables()));
+        return Collections.singletonList(GlobalScope.getGlobalScope(context.getCoreLibrary().globalVariables));
     }
 
     public String getTruffleLanguageHome() {
diff --git a/src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java b/src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java
@@ -232,7 +232,7 @@ private static void addMethod(RubyContext context, DynamicObject module,
     private static SharedMethodInfo makeSharedMethodInfo(RubyContext context, LexicalScope lexicalScope,
             DynamicObject module, String name, Arity arity) {
         return new SharedMethodInfo(
-                context.getCoreLibrary().getSourceSection(),
+                context.getCoreLibrary().sourceSection,
                 lexicalScope,
                 arity,
                 module,
diff --git a/src/main/java/org/truffleruby/core/CoreLibrary.java b/src/main/java/org/truffleruby/core/CoreLibrary.java
@@ -91,7 +91,7 @@ public class CoreLibrary {
 
     private final RubyContext context;
 
-    private final SourceSection sourceSection;
+    public final SourceSection sourceSection;
 
     public final DynamicObject argumentErrorClass;
     public final DynamicObject arrayClass;
@@ -199,9 +199,9 @@ public class CoreLibrary {
     public final DynamicObject mainObject;
     public final DynamicObject nil;
 
-    private final GlobalVariables globalVariables;
+    public final GlobalVariables globalVariables;
 
-    private final FrameDescriptor emptyDescriptor;
+    public final FrameDescriptor emptyDescriptor;
 
     @CompilationFinal private DynamicObject eagainWaitReadable;
     @CompilationFinal private DynamicObject eagainWaitWritable;
@@ -222,7 +222,7 @@ public class CoreLibrary {
 
     private final ConcurrentMap<String, Boolean> patchFiles;
 
-    private final String coreLoadPath;
+    public final String coreLoadPath;
 
     @TruffleBoundary
     private SourceSection initCoreSourceSection(RubyContext context) {
@@ -838,7 +838,7 @@ public void loadRubyCoreLibraryAndPostBoot() {
                     state = State.LOADED;
                 }
 
-                final RubySource source = loadCoreFile(getCoreLoadPath() + file);
+                final RubySource source = loadCoreFile(coreLoadPath + file);
                 final RubyRootNode rootNode = context
                         .getCodeLoader()
                         .parse(source, ParserContext.TOP_LEVEL, null, null, true, node);
@@ -897,7 +897,7 @@ private void afterLoadCoreLibrary() {
         // Initialize $0 so it is set to a String as RubyGems expect, also when not run from the RubyLauncher
         DynamicObject dollarZeroValue = StringOperations
                 .createString(context, StringOperations.encodeRope("-", USASCIIEncoding.INSTANCE, CodeRange.CR_7BIT));
-        getContext().getCoreLibrary().getGlobalVariables().getStorage("$0").setValueInternal(dollarZeroValue);
+        globalVariables.getStorage("$0").setValueInternal(dollarZeroValue);
     }
 
     @TruffleBoundary
@@ -974,26 +974,6 @@ public static boolean fitsIntoUnsignedInteger(long value) {
         return value == (value & 0xffffffffL) || value < 0 && value >= Integer.MIN_VALUE;
     }
 
-    public RubyContext getContext() {
-        return context;
-    }
-
-    public SourceSection getSourceSection() {
-        return sourceSection;
-    }
-
-    public String getCoreLoadPath() {
-        return coreLoadPath;
-    }
-
-    public FrameDescriptor getEmptyDescriptor() {
-        return emptyDescriptor;
-    }
-
-    public GlobalVariables getGlobalVariables() {
-        return globalVariables;
-    }
-
     public DynamicObject getLoadPath() {
         return (DynamicObject) loadPathReader.getValue(globalVariables);
     }
diff --git a/src/main/java/org/truffleruby/core/kernel/KernelNodes.java b/src/main/java/org/truffleruby/core/kernel/KernelNodes.java
@@ -1901,7 +1901,7 @@ public abstract static class KernelGlobalVariablesNode extends CoreMethodArrayAr
         @TruffleBoundary
         @Specialization
         protected DynamicObject globalVariables() {
-            final String[] keys = coreLibrary().getGlobalVariables().keys();
+            final String[] keys = coreLibrary().globalVariables.keys();
             final Object[] store = new Object[keys.length];
             for (int i = 0; i < keys.length; i++) {
                 store[i] = getSymbol(keys[i]);
diff --git a/src/main/java/org/truffleruby/core/kernel/TruffleKernelNodes.java b/src/main/java/org/truffleruby/core/kernel/TruffleKernelNodes.java
@@ -153,7 +153,7 @@ public abstract static class DefineHookedVariableInnerNode extends CoreMethodArr
         @Specialization(guards = { "isRubySymbol(name)", "isRubyProc(getter)", "isRubyProc(setter)" })
         protected DynamicObject defineHookedVariableInnerNode(DynamicObject name, DynamicObject getter,
                 DynamicObject setter, DynamicObject isDefined) {
-            getContext().getCoreLibrary().getGlobalVariables().define(
+            getContext().getCoreLibrary().globalVariables.define(
                     Layouts.SYMBOL.getString(name),
                     getter,
                     setter,
diff --git a/src/main/java/org/truffleruby/core/method/MethodNodes.java b/src/main/java/org/truffleruby/core/method/MethodNodes.java
@@ -263,7 +263,7 @@ private DynamicObject createProc(RootCallTarget callTarget, InternalMethod metho
             final Object[] packedArgs = RubyArguments.pack(null, null, method, null, receiver, null, EMPTY_ARGUMENTS);
             final MaterializedFrame declarationFrame = Truffle
                     .getRuntime()
-                    .createMaterializedFrame(packedArgs, coreLibrary().getEmptyDescriptor());
+                    .createMaterializedFrame(packedArgs, coreLibrary().emptyDescriptor);
             return ProcOperations.createRubyProc(
                     coreLibrary().procFactory,
                     ProcType.LAMBDA,
diff --git a/src/main/java/org/truffleruby/core/symbol/SymbolNodes.java b/src/main/java/org/truffleruby/core/symbol/SymbolNodes.java
@@ -141,7 +141,7 @@ protected DynamicObject createProc(DeclarationContext declarationContext, Intern
             // binding as this simplifies the logic elsewhere in the runtime.
             final MaterializedFrame declarationFrame = Truffle
                     .getRuntime()
-                    .createMaterializedFrame(args, coreLibrary().getEmptyDescriptor());
+                    .createMaterializedFrame(args, coreLibrary().emptyDescriptor);
             final RubyRootNode rootNode = new RubyRootNode(
                     getContext(),
                     sourceSection,
diff --git a/src/main/java/org/truffleruby/extra/TruffleGraalNodes.java b/src/main/java/org/truffleruby/extra/TruffleGraalNodes.java
@@ -127,7 +127,7 @@ protected DynamicObject copyCapturedLocals(DynamicObject proc) {
             // declaration frame (to allow Proc#binding) so we shall create an empty one.
             final MaterializedFrame newDeclarationFrame = Truffle
                     .getRuntime()
-                    .createMaterializedFrame(args, coreLibrary().getEmptyDescriptor());
+                    .createMaterializedFrame(args, coreLibrary().emptyDescriptor);
 
             return coreLibrary().procFactory.newInstance(Layouts.PROC.build(
                     Layouts.PROC.getType(proc),
diff --git a/src/main/java/org/truffleruby/language/TruffleBootNodes.java b/src/main/java/org/truffleruby/language/TruffleBootNodes.java
@@ -164,14 +164,14 @@ private void setArgvGlobals(StringNodes.MakeStringNode makeStringNode) {
                     String key = global_values[i];
                     String value = global_values[i + 1];
 
-                    getContext().getCoreLibrary().getGlobalVariables().define(
+                    getContext().getCoreLibrary().globalVariables.define(
                             "$" + key,
                             makeStringNode.executeMake(value, UTF8Encoding.INSTANCE, CodeRange.CR_UNKNOWN));
                 }
 
                 String[] global_flags = getContext().getOptions().ARGV_GLOBAL_FLAGS;
                 for (String flag : global_flags) {
-                    getContext().getCoreLibrary().getGlobalVariables().define("$" + flag, true);
+                    getContext().getCoreLibrary().globalVariables.define("$" + flag, true);
                 }
             }
         }
@@ -211,7 +211,7 @@ private RubySource loadMainSourceSettingDollarZero(StringNodes.MakeStringNode ma
                 throw new JavaException(e);
             }
 
-            getContext().getCoreLibrary().getGlobalVariables().getStorage("$0").setValueInternal(dollarZeroValue);
+            getContext().getCoreLibrary().globalVariables.getStorage("$0").setValueInternal(dollarZeroValue);
             return source;
         }
 
diff --git a/src/main/java/org/truffleruby/language/globals/AliasGlobalVarNode.java b/src/main/java/org/truffleruby/language/globals/AliasGlobalVarNode.java
@@ -25,7 +25,7 @@ public AliasGlobalVarNode(String oldName, String newName) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        getContext().getCoreLibrary().getGlobalVariables().alias(oldName, newName);
+        getContext().getCoreLibrary().globalVariables.alias(oldName, newName);
         return nil();
     }
 
diff --git a/src/main/java/org/truffleruby/language/globals/IsDefinedGlobalVariableNode.java b/src/main/java/org/truffleruby/language/globals/IsDefinedGlobalVariableNode.java
@@ -64,7 +64,7 @@ protected int isDefinedArity(GlobalVariableStorage storage) {
     }
 
     protected GlobalVariableStorage getStorage() {
-        return getContext().getCoreLibrary().getGlobalVariables().getStorage(name);
+        return getContext().getCoreLibrary().globalVariables.getStorage(name);
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/globals/ReadGlobalVariableNode.java b/src/main/java/org/truffleruby/language/globals/ReadGlobalVariableNode.java
@@ -57,7 +57,7 @@ protected int getterArity(GlobalVariableStorage storage) {
     }
 
     protected GlobalVariableStorage getStorage() {
-        return getContext().getCoreLibrary().getGlobalVariables().getStorage(name);
+        return getContext().getCoreLibrary().globalVariables.getStorage(name);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/language/globals/ReadSimpleGlobalVariableNode.java b/src/main/java/org/truffleruby/language/globals/ReadSimpleGlobalVariableNode.java
@@ -42,7 +42,7 @@ protected Object read(
     }
 
     protected GlobalVariableStorage getStorage() {
-        return coreLibrary().getGlobalVariables().getStorage(name);
+        return coreLibrary().globalVariables.getStorage(name);
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/globals/WriteGlobalVariableNode.java b/src/main/java/org/truffleruby/language/globals/WriteGlobalVariableNode.java
@@ -62,7 +62,7 @@ protected int setterArity(GlobalVariableStorage storage) {
     }
 
     protected GlobalVariableStorage getStorage() {
-        return getContext().getCoreLibrary().getGlobalVariables().getStorage(name);
+        return getContext().getCoreLibrary().globalVariables.getStorage(name);
     }
 
     @Override
diff --git a/src/main/java/org/truffleruby/language/globals/WriteSimpleGlobalVariableNode.java b/src/main/java/org/truffleruby/language/globals/WriteSimpleGlobalVariableNode.java
@@ -71,7 +71,7 @@ protected Object write(Object value,
     }
 
     protected GlobalVariableStorage getStorage() {
-        return coreLibrary().getGlobalVariables().getStorage(name);
+        return coreLibrary().globalVariables.getStorage(name);
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/objects/ObjectGraph.java b/src/main/java/org/truffleruby/language/objects/ObjectGraph.java
@@ -98,7 +98,7 @@ public static Set<DynamicObject> stopAndGetRootObjects(Node currentNode, final R
 
     public static void visitContextRoots(RubyContext context, Collection<DynamicObject> roots) {
         // We do not want to expose the global object
-        roots.addAll(context.getCoreLibrary().getGlobalVariables().dynamicObjectValues());
+        roots.addAll(context.getCoreLibrary().globalVariables.dynamicObjectValues());
         roots.addAll(context.getAtExitManager().getHandlers());
         context.getFinalizationService().collectRoots(roots);
     }
diff --git a/src/main/java/org/truffleruby/language/objects/shared/SharedObjects.java b/src/main/java/org/truffleruby/language/objects/shared/SharedObjects.java
@@ -52,7 +52,7 @@ private static void shareContextRoots(RubyContext context) {
         final Deque<DynamicObject> stack = new ArrayDeque<>();
 
         // Share global variables (including new ones)
-        for (DynamicObject object : context.getCoreLibrary().getGlobalVariables().dynamicObjectValues()) {
+        for (DynamicObject object : context.getCoreLibrary().globalVariables.dynamicObjectValues()) {
             stack.push(object);
         }
 
diff --git a/src/main/java/org/truffleruby/parser/MethodTranslator.java b/src/main/java/org/truffleruby/parser/MethodTranslator.java
@@ -79,7 +79,7 @@ public MethodTranslator(
 
         if (parserContext == ParserContext.EVAL || context.getCoverageManager().isEnabled()) {
             shouldLazyTranslate = false;
-        } else if (context.getPath(source).startsWith(context.getCoreLibrary().getCoreLoadPath())) {
+        } else if (context.getPath(source).startsWith(context.getCoreLibrary().coreLoadPath)) {
             shouldLazyTranslate = context.getOptions().LAZY_TRANSLATION_CORE;
         } else {
             shouldLazyTranslate = context.getOptions().LAZY_TRANSLATION_USER;
diff --git a/src/main/java/org/truffleruby/parser/ParseEnvironment.java b/src/main/java/org/truffleruby/parser/ParseEnvironment.java
@@ -27,7 +27,7 @@ public class ParseEnvironment {
 
     public ParseEnvironment(RubyContext context) {
         if (context != null) {
-            corePath = context.getCoreLibrary().getCoreLoadPath() + File.separator + "core" + File.separator;
+            corePath = context.getCoreLibrary().coreLoadPath + File.separator + "core" + File.separator;
         } else {
             corePath = null;
         }
diff --git a/src/main/java/org/truffleruby/parser/TranslatorDriver.java b/src/main/java/org/truffleruby/parser/TranslatorDriver.java
@@ -394,7 +394,7 @@ private TranslatorEnvironment environmentForFrame(RubyContext context, Materiali
             return null;
         } else {
             final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(
-                    context.getCoreLibrary().getSourceSection(),
+                    context.getCoreLibrary().sourceSection,
                     context.getRootLexicalScope(),
                     Arity.NO_ARGUMENTS,
                     null,

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ protected Iterable<Scope> findLocalScopes(RubyContext context, Node node, Frame`
`277`	`277`
`278`	`278`	`@Override`
`279`	`279`	`protected Iterable<Scope> findTopScopes(RubyContext context) {`
`280`		`- return Collections.singletonList(GlobalScope.getGlobalScope(context.getCoreLibrary().getGlobalVariables()));`
	`280`	`+ return Collections.singletonList(GlobalScope.getGlobalScope(context.getCoreLibrary().globalVariables));`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`public String getTruffleLanguageHome() {`
Original file line number	Diff line number	Diff line change
`@@ -164,14 +164,14 @@ private void setArgvGlobals(StringNodes.MakeStringNode makeStringNode) {`
`164`	`164`	`String key = global_values[i];`
`165`	`165`	`String value = global_values[i + 1];`
`166`	`166`
`167`		`- getContext().getCoreLibrary().getGlobalVariables().define(`
	`167`	`+ getContext().getCoreLibrary().globalVariables.define(`
`168`	`168`	`"$" + key,`
`169`	`169`	`makeStringNode.executeMake(value, UTF8Encoding.INSTANCE, CodeRange.CR_UNKNOWN));`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`String[] global_flags = getContext().getOptions().ARGV_GLOBAL_FLAGS;`
`173`	`173`	`for (String flag : global_flags) {`
`174`		`- getContext().getCoreLibrary().getGlobalVariables().define("$" + flag, true);`
	`174`	`+ getContext().getCoreLibrary().globalVariables.define("$" + flag, true);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
`@@ -211,7 +211,7 @@ private RubySource loadMainSourceSettingDollarZero(StringNodes.MakeStringNode ma`
`211`	`211`	`throw new JavaException(e);`
`212`	`212`	`}`
`213`	`213`
`214`		`- getContext().getCoreLibrary().getGlobalVariables().getStorage("$0").setValueInternal(dollarZeroValue);`
	`214`	`+ getContext().getCoreLibrary().globalVariables.getStorage("$0").setValueInternal(dollarZeroValue);`
`215`	`215`	`return source;`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public AliasGlobalVarNode(String oldName, String newName) {`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public Object execute(VirtualFrame frame) {`
`28`		`- getContext().getCoreLibrary().getGlobalVariables().alias(oldName, newName);`
	`28`	`+ getContext().getCoreLibrary().globalVariables.alias(oldName, newName);`
`29`	`29`	`return nil();`
`30`	`30`	`}`
`31`	`31`