[Truffle] Rename ObjectLiteralNode to just LiteralNode.

jruby · May 20, 2015 · 4da5af7 · 4da5af7
1 parent ccb351d
commit 4da5af7
Showing 14 changed files with 76 additions and 76 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantNode.java
@@ -10,7 +10,7 @@
 package org.jruby.truffle.nodes.constants;
 
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.runtime.LexicalScope;
 import org.jruby.truffle.runtime.RubyConstant;
 import org.jruby.truffle.runtime.RubyContext;
@@ -29,7 +29,7 @@ public ReadConstantNode(RubyContext context, SourceSection sourceSection, String
         super(context, sourceSection);
         this.name = name;
         this.getConstantNode =
-                GetConstantNodeGen.create(context, sourceSection, receiver, new ObjectLiteralNode(context, sourceSection, name),
+                GetConstantNodeGen.create(context, sourceSection, receiver, new LiteralNode(context, sourceSection, name),
                         LookupConstantNodeGen.create(context, sourceSection, lexicalScope, null, null));
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 import java.util.ArrayList;
@@ -48,7 +48,7 @@ public static RubyNode sequence(RubyContext context, SourceSection sourceSection
 
         if (flattened.isEmpty()) {
             return new DefinedWrapperNode(context, sourceSection,
-                    new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                    new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                     "nil");
         } else if (flattened.size() == 1) {
             return flattened.get(0);
@@ -64,7 +64,7 @@ private static List<RubyNode> flatten(RubyContext context, List<RubyNode> sequen
             final boolean lastNode = n == sequence.size() - 1;
             final RubyNode node = sequence.get(n);
 
-            if (node instanceof ObjectLiteralNode && ((ObjectLiteralNode) node).getObject() == context.getCoreLibrary().getNilObject()) {
+            if (node instanceof LiteralNode && ((LiteralNode) node).getObject() == context.getCoreLibrary().getNilObject()) {
                 if (allowTrailingNil && lastNode) {
                     flattened.add(node);
                 }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -49,7 +49,7 @@
 import org.jruby.truffle.nodes.dispatch.DispatchAction;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.MissingBehavior;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.methods.SetMethodDeclarationContext;
 import org.jruby.truffle.nodes.objects.*;
 import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/RubyCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/RubyCallNode.java
@@ -23,7 +23,7 @@
 import org.jruby.truffle.nodes.cast.ProcOrNullNode;
 import org.jruby.truffle.nodes.cast.ProcOrNullNodeGen;
 import org.jruby.truffle.nodes.core.hash.HashLiteralNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.methods.MarkerNode;
 import org.jruby.truffle.runtime.ModuleOperations;
 import org.jruby.truffle.runtime.RubyArguments;
@@ -285,23 +285,23 @@ public RubyNode[] expandedArgumentNodes(InternalMethod method, RubyNode[] argume
             List<String> restKeywordLabels = new ArrayList<>();
             for (int j = 0; j < hashNode.size(); j++) {
                 Object key = hashNode.getKey(j);
-                boolean keyIsSymbol = key instanceof ObjectLiteralNode &&
-                        ((ObjectLiteralNode) key).getObject() instanceof RubySymbol;
+                boolean keyIsSymbol = key instanceof LiteralNode &&
+                        ((LiteralNode) key).getObject() instanceof RubySymbol;
 
                 if (!keyIsSymbol) {
                     // cannot optimize case where keyword label is dynamic (not a fixed RubySymbol)
                     cannotOptimize = true;
                     return null;
                 }
 
-                final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
+                final String label = ((LiteralNode) hashNode.getKey(j)).getObject().toString();
                 restKeywordLabels.add(label);
             }
 
             for (String kwarg : kwargs) {
                 result[i] = new OptionalKeywordArgMissingNode(getContext(), null);
                 for (int j = 0; j < hashNode.size(); j++) {
-                    final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
+                    final String label = ((LiteralNode) hashNode.getKey(j)).getObject().toString();
 
                     if (label.equals(kwarg)) {
                         result[i] = hashNode.getValue(j);
@@ -323,7 +323,7 @@ public RubyNode[] expandedArgumentNodes(InternalMethod method, RubyNode[] argume
 
                 for (String label : restKeywordLabels) {
                     for (int j = 0; j < hashNode.size(); j++) {
-                        final String argLabel = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
+                        final String argLabel = ((LiteralNode) hashNode.getKey(j)).getObject().toString();
 
                         if (argLabel.equals(label)) {
                             keyValues[i++] = hashNode.getKey(j);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TryNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TryNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.methods.ExceptionTranslatingNode;
 import org.jruby.truffle.nodes.objects.WriteInstanceVariableNode;
 import org.jruby.truffle.runtime.RubyContext;
@@ -45,9 +45,9 @@ public TryNode(RubyContext context, SourceSection sourceSection, ExceptionTransl
         this.rescueParts = rescueParts;
         this.elsePart = elsePart;
         clearExceptionVariableNode = new WriteInstanceVariableNode(context, sourceSection, "$!",
-                new ObjectLiteralNode(context, sourceSection, context.getThreadManager().getCurrentThread().getThreadLocals()),
+                new LiteralNode(context, sourceSection, context.getThreadManager().getCurrentThread().getThreadLocals()),
                 new DefinedWrapperNode(context, sourceSection,
-                        new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                        new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                         "nil"),
                 true);
     }

diff --git a/...ffle/nodes/literal/ObjectLiteralNode.java → ...by/truffle/nodes/literal/LiteralNode.java b/...ffle/nodes/literal/ObjectLiteralNode.java → ...by/truffle/nodes/literal/LiteralNode.java
@@ -17,11 +17,11 @@
 import org.jruby.truffle.runtime.RubyContext;
 
 @NodeInfo(cost = NodeCost.NONE)
-public class ObjectLiteralNode extends RubyNode {
+public class LiteralNode extends RubyNode {
 
     private final Object object;
 
-    public ObjectLiteralNode(RubyContext context, SourceSection sourceSection, Object object) {
+    public LiteralNode(RubyContext context, SourceSection sourceSection, Object object) {
         super(context, sourceSection);
         this.object = object;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java
@@ -49,7 +49,7 @@
 import org.jruby.truffle.nodes.core.KernelNodes;
 import org.jruby.truffle.nodes.core.KernelNodesFactory;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.objects.ClassNode;
 import org.jruby.truffle.nodes.objects.ClassNodeGen;
 import org.jruby.truffle.nodes.objects.WriteInstanceVariableNode;
@@ -112,9 +112,9 @@ public Object doCatch(VirtualFrame frame, Object tag, RubyProc block) {
                         SourceSection sourceSection = getSourceSection();
                         clearExceptionVariableNode = insert(
                                 new WriteInstanceVariableNode(getContext(), getSourceSection(), "$!",
-                                        new ObjectLiteralNode(getContext(), getSourceSection(), getContext().getThreadManager().getCurrentThread().getThreadLocals()),
+                                        new LiteralNode(getContext(), getSourceSection(), getContext().getThreadManager().getCurrentThread().getThreadLocals()),
                                         new DefinedWrapperNode(context, sourceSection,
-                                                new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                                                new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                                                 "nil"),
                                         true)
                         );

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/DebugOperations.java b/truffle/src/main/java/org/jruby/truffle/runtime/DebugOperations.java
@@ -23,7 +23,7 @@
 import com.oracle.truffle.api.object.Shape;
 
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.objects.FreezeNode;
 import org.jruby.truffle.nodes.objects.FreezeNodeGen;
 import org.jruby.truffle.nodes.objects.IsFrozenNode;
@@ -147,7 +147,7 @@ private static Object executeInNewNode(final RubyNode node) {
     }
 
     public static boolean verySlowIsFrozen(RubyContext context, Object object) {
-        return (boolean) executeInNewNode(IsFrozenNodeGen.create(context, null, new ObjectLiteralNode(context, null, object)));
+        return (boolean) executeInNewNode(IsFrozenNodeGen.create(context, null, new LiteralNode(context, null, object)));
     }
 
     private static void printASTForBacktrace(Node node, List<Node> activeNodes, int indentation) {

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
@@ -27,7 +27,7 @@
 import org.jruby.truffle.nodes.core.array.ArraySliceNodeGen;
 import org.jruby.truffle.nodes.core.array.PrimitiveArrayNodeFactory;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.locals.ReadLocalVariableNode;
 import org.jruby.truffle.nodes.locals.WriteLocalVariableNode;
 import org.jruby.truffle.runtime.RubyContext;
@@ -176,7 +176,7 @@ public RubyNode visitKeywordArgNode(org.jruby.ast.KeywordArgNode node) {
 
             if (localAsgnNode.getValueNode() == null) {
                 defaultValue = new DefinedWrapperNode(context, sourceSection,
-                        new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                        new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                         "nil");
             } else if (localAsgnNode.getValueNode() instanceof RequiredKeywordArgumentValueNode) {
                 /*
@@ -193,7 +193,7 @@ public RubyNode visitKeywordArgNode(org.jruby.ast.KeywordArgNode node) {
 
             if (dAsgnNode.getValueNode() == null) {
                 defaultValue = new DefinedWrapperNode(context, sourceSection,
-                        new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                        new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                         "nil");
             } else if (dAsgnNode.getValueNode() instanceof RequiredKeywordArgumentValueNode) {
                 /*
@@ -415,7 +415,7 @@ public RubyNode visitMultipleAsgnNode(MultipleAsgnNode node) {
 
         for (String parameterToClear : parametersToClearCollector.getParameters()) {
             nilSequence.add(((ReadNode) methodBodyTranslator.getEnvironment().findOrAddLocalVarNodeDangerous(parameterToClear, sourceSection)).makeWriteNode(new DefinedWrapperNode(context, sourceSection,
-                    new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                    new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                     "nil")));
         }
 
@@ -435,7 +435,7 @@ public RubyNode visitMultipleAsgnNode(MultipleAsgnNode node) {
                         new IsNilNode(context, sourceSection, new ReadLocalVariableNode(context, sourceSection, arraySlot)),
                         nil,
                         notNil == null ? new DefinedWrapperNode(context, sourceSection,
-                                new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                                new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                                 "nil") : notNil));
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
@@ -28,7 +28,7 @@
 import org.jruby.truffle.nodes.control.SequenceNode;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
 import org.jruby.truffle.nodes.dispatch.RespondToNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.locals.FlipFlopStateNode;
 import org.jruby.truffle.nodes.locals.WriteLocalVariableNode;
 import org.jruby.truffle.nodes.methods.*;
@@ -91,7 +91,7 @@ public RubyNode compileFunctionNode(SourceSection sourceSection, String methodNa
             }
         } else {
             body = new DefinedWrapperNode(context, sourceSection,
-                    new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                    new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                     "nil");
         }
 
@@ -142,7 +142,7 @@ public RubyNode compileFunctionNode(SourceSection sourceSection, String methodNa
             prelude = SequenceNode.sequence(context, sourceSection,
                     new BehaveAsBlockNode(context, sourceSection,
                             new DefinedWrapperNode(context, sourceSection,
-                                    new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                                    new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                                     "nil"),
                             new CheckArityNode(context, sourceSection, arityForCheck, parameterCollector.getKeywords(), argsNode.getKeyRest() != null)), preludeBuilder);
         } else {

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/ModuleTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/ModuleTranslator.java
@@ -18,7 +18,7 @@
 import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.control.SequenceNode;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.methods.AliasNodeGen;
 import org.jruby.truffle.nodes.methods.CatchReturnPlaceholderNode;
 import org.jruby.truffle.nodes.methods.MethodDefinitionNode;
@@ -55,7 +55,7 @@ public MethodDefinitionNode compileClassNode(SourceSection sourceSection, String
             }
         } else {
             body = new DefinedWrapperNode(context, sourceSection,
-                    new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                    new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                     "nil");
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/ReloadArgumentsTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/ReloadArgumentsTranslator.java
@@ -17,7 +17,7 @@
 import org.jruby.ast.OptArgNode;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.control.SequenceNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.locals.ReadLocalVariableNode;
 import org.jruby.truffle.runtime.RubyContext;
 
@@ -90,7 +90,7 @@ public RubyNode visitOptArgNode(OptArgNode node) {
     @Override
     protected RubyNode defaultVisit(org.jruby.ast.Node node) {
         final SourceSection sourceSection = translate(node.getPosition());
-        return new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject());
+        return new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject());
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java b/truffle/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
@@ -23,7 +23,7 @@
 import org.jruby.truffle.nodes.RubyRootNode;
 import org.jruby.truffle.nodes.control.SequenceNode;
 import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
-import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
+import org.jruby.truffle.nodes.literal.LiteralNode;
 import org.jruby.truffle.nodes.methods.CatchNextNode;
 import org.jruby.truffle.nodes.methods.CatchRetryAsErrorNode;
 import org.jruby.truffle.nodes.methods.CatchReturnAsErrorNode;
@@ -154,7 +154,7 @@ public RubyRootNode parse(Node currentNode, RubyContext context, Source source,
             translator.parentSourceSection.push(sourceSection);
             try {
                 truffleNode = new DefinedWrapperNode(context, sourceSection,
-                        new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
+                        new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
                         "nil");
             } finally {
                 translator.parentSourceSection.pop();