Skip to content

Commit 4da5af7

Browse files
eregoneregon
committed
[Truffle] Rename ObjectLiteralNode to just LiteralNode.
1 parent ccb351d commit 4da5af7

14 files changed

+76
-76
lines changed

‎truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package org.jruby.truffle.nodes.constants;
1111

1212
import org.jruby.truffle.nodes.RubyNode;
13-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
13+
import org.jruby.truffle.nodes.literal.LiteralNode;
1414
import org.jruby.truffle.runtime.LexicalScope;
1515
import org.jruby.truffle.runtime.RubyConstant;
1616
import org.jruby.truffle.runtime.RubyContext;
@@ -29,7 +29,7 @@ public ReadConstantNode(RubyContext context, SourceSection sourceSection, String
2929
super(context, sourceSection);
3030
this.name = name;
3131
this.getConstantNode =
32-
GetConstantNodeGen.create(context, sourceSection, receiver, new ObjectLiteralNode(context, sourceSection, name),
32+
GetConstantNodeGen.create(context, sourceSection, receiver, new LiteralNode(context, sourceSection, name),
3333
LookupConstantNodeGen.create(context, sourceSection, lexicalScope, null, null));
3434
}
3535

‎truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.oracle.truffle.api.source.SourceSection;
1717
import org.jruby.truffle.nodes.RubyNode;
1818
import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
19-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
19+
import org.jruby.truffle.nodes.literal.LiteralNode;
2020
import org.jruby.truffle.runtime.RubyContext;
2121

2222
import java.util.ArrayList;
@@ -48,7 +48,7 @@ public static RubyNode sequence(RubyContext context, SourceSection sourceSection
4848

4949
if (flattened.isEmpty()) {
5050
return new DefinedWrapperNode(context, sourceSection,
51-
new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
51+
new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
5252
"nil");
5353
} else if (flattened.size() == 1) {
5454
return flattened.get(0);
@@ -64,7 +64,7 @@ private static List<RubyNode> flatten(RubyContext context, List<RubyNode> sequen
6464
final boolean lastNode = n == sequence.size() - 1;
6565
final RubyNode node = sequence.get(n);
6666

67-
if (node instanceof ObjectLiteralNode && ((ObjectLiteralNode) node).getObject() == context.getCoreLibrary().getNilObject()) {
67+
if (node instanceof LiteralNode && ((LiteralNode) node).getObject() == context.getCoreLibrary().getNilObject()) {
6868
if (allowTrailingNil && lastNode) {
6969
flattened.add(node);
7070
}

‎truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.jruby.truffle.nodes.dispatch.DispatchAction;
5050
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
5151
import org.jruby.truffle.nodes.dispatch.MissingBehavior;
52-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
52+
import org.jruby.truffle.nodes.literal.LiteralNode;
5353
import org.jruby.truffle.nodes.methods.SetMethodDeclarationContext;
5454
import org.jruby.truffle.nodes.objects.*;
5555
import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;

‎truffle/src/main/java/org/jruby/truffle/nodes/dispatch/RubyCallNode.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.jruby.truffle.nodes.cast.ProcOrNullNode;
2424
import org.jruby.truffle.nodes.cast.ProcOrNullNodeGen;
2525
import org.jruby.truffle.nodes.core.hash.HashLiteralNode;
26-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
26+
import org.jruby.truffle.nodes.literal.LiteralNode;
2727
import org.jruby.truffle.nodes.methods.MarkerNode;
2828
import org.jruby.truffle.runtime.ModuleOperations;
2929
import org.jruby.truffle.runtime.RubyArguments;
@@ -285,23 +285,23 @@ public RubyNode[] expandedArgumentNodes(InternalMethod method, RubyNode[] argume
285285
List<String> restKeywordLabels = new ArrayList<>();
286286
for (int j = 0; j < hashNode.size(); j++) {
287287
Object key = hashNode.getKey(j);
288-
boolean keyIsSymbol = key instanceof ObjectLiteralNode &&
289-
((ObjectLiteralNode) key).getObject() instanceof RubySymbol;
288+
boolean keyIsSymbol = key instanceof LiteralNode &&
289+
((LiteralNode) key).getObject() instanceof RubySymbol;
290290

291291
if (!keyIsSymbol) {
292292
// cannot optimize case where keyword label is dynamic (not a fixed RubySymbol)
293293
cannotOptimize = true;
294294
return null;
295295
}
296296

297-
final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
297+
final String label = ((LiteralNode) hashNode.getKey(j)).getObject().toString();
298298
restKeywordLabels.add(label);
299299
}
300300

301301
for (String kwarg : kwargs) {
302302
result[i] = new OptionalKeywordArgMissingNode(getContext(), null);
303303
for (int j = 0; j < hashNode.size(); j++) {
304-
final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
304+
final String label = ((LiteralNode) hashNode.getKey(j)).getObject().toString();
305305

306306
if (label.equals(kwarg)) {
307307
result[i] = hashNode.getValue(j);
@@ -323,7 +323,7 @@ public RubyNode[] expandedArgumentNodes(InternalMethod method, RubyNode[] argume
323323

324324
for (String label : restKeywordLabels) {
325325
for (int j = 0; j < hashNode.size(); j++) {
326-
final String argLabel = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
326+
final String argLabel = ((LiteralNode) hashNode.getKey(j)).getObject().toString();
327327

328328
if (argLabel.equals(label)) {
329329
keyValues[i++] = hashNode.getKey(j);

‎truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TryNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.oracle.truffle.api.utilities.BranchProfile;
1717
import org.jruby.truffle.nodes.RubyNode;
1818
import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
19-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
19+
import org.jruby.truffle.nodes.literal.LiteralNode;
2020
import org.jruby.truffle.nodes.methods.ExceptionTranslatingNode;
2121
import org.jruby.truffle.nodes.objects.WriteInstanceVariableNode;
2222
import org.jruby.truffle.runtime.RubyContext;
@@ -45,9 +45,9 @@ public TryNode(RubyContext context, SourceSection sourceSection, ExceptionTransl
4545
this.rescueParts = rescueParts;
4646
this.elsePart = elsePart;
4747
clearExceptionVariableNode = new WriteInstanceVariableNode(context, sourceSection, "$!",
48-
new ObjectLiteralNode(context, sourceSection, context.getThreadManager().getCurrentThread().getThreadLocals()),
48+
new LiteralNode(context, sourceSection, context.getThreadManager().getCurrentThread().getThreadLocals()),
4949
new DefinedWrapperNode(context, sourceSection,
50-
new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
50+
new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
5151
"nil"),
5252
true);
5353
}

‎truffle/src/main/java/org/jruby/truffle/nodes/literal/ObjectLiteralNode.java renamed to ‎truffle/src/main/java/org/jruby/truffle/nodes/literal/LiteralNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import org.jruby.truffle.runtime.RubyContext;
1818

1919
@NodeInfo(cost = NodeCost.NONE)
20-
public class ObjectLiteralNode extends RubyNode {
20+
public class LiteralNode extends RubyNode {
2121

2222
private final Object object;
2323

24-
public ObjectLiteralNode(RubyContext context, SourceSection sourceSection, Object object) {
24+
public LiteralNode(RubyContext context, SourceSection sourceSection, Object object) {
2525
super(context, sourceSection);
2626
this.object = object;
2727
}

‎truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.jruby.truffle.nodes.core.KernelNodes;
5050
import org.jruby.truffle.nodes.core.KernelNodesFactory;
5151
import org.jruby.truffle.nodes.defined.DefinedWrapperNode;
52-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
52+
import org.jruby.truffle.nodes.literal.LiteralNode;
5353
import org.jruby.truffle.nodes.objects.ClassNode;
5454
import org.jruby.truffle.nodes.objects.ClassNodeGen;
5555
import org.jruby.truffle.nodes.objects.WriteInstanceVariableNode;
@@ -112,9 +112,9 @@ public Object doCatch(VirtualFrame frame, Object tag, RubyProc block) {
112112
SourceSection sourceSection = getSourceSection();
113113
clearExceptionVariableNode = insert(
114114
new WriteInstanceVariableNode(getContext(), getSourceSection(), "$!",
115-
new ObjectLiteralNode(getContext(), getSourceSection(), getContext().getThreadManager().getCurrentThread().getThreadLocals()),
115+
new LiteralNode(getContext(), getSourceSection(), getContext().getThreadManager().getCurrentThread().getThreadLocals()),
116116
new DefinedWrapperNode(context, sourceSection,
117-
new ObjectLiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
117+
new LiteralNode(context, sourceSection, context.getCoreLibrary().getNilObject()),
118118
"nil"),
119119
true)
120120
);

‎truffle/src/main/java/org/jruby/truffle/runtime/DebugOperations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.oracle.truffle.api.object.Shape;
2424

2525
import org.jruby.truffle.nodes.RubyNode;
26-
import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
26+
import org.jruby.truffle.nodes.literal.LiteralNode;
2727
import org.jruby.truffle.nodes.objects.FreezeNode;
2828
import org.jruby.truffle.nodes.objects.FreezeNodeGen;
2929
import org.jruby.truffle.nodes.objects.IsFrozenNode;
@@ -147,7 +147,7 @@ private static Object executeInNewNode(final RubyNode node) {
147147
}
148148

149149
public static boolean verySlowIsFrozen(RubyContext context, Object object) {
150-
return (boolean) executeInNewNode(IsFrozenNodeGen.create(context, null, new ObjectLiteralNode(context, null, object)));
150+
return (boolean) executeInNewNode(IsFrozenNodeGen.create(context, null, new LiteralNode(context, null, object)));
151151
}
152152

153153
private static void printASTForBacktrace(Node node, List<Node> activeNodes, int indentation) {

0 commit comments

Comments
 (0)