Skip to content
Snippets Groups Projects
Commit e6418645 authored by Michael Haupt's avatar Michael Haupt
Browse files

refactoring: rename CallNode -> RCallNode (preparation for adoption of Truffle... 

refactoring: rename CallNode -> RCallNode (preparation for adoption of Truffle changes around CallNode handling)
parent 53dc78a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 31 deletions
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTruffleVisitor.java
+ 4
− 4
View file @ e6418645
......@@ -97,7 +97,7 @@ public final class RTruffleVisitor extends BasicVisitor<RNode> {
nodes[index] = e.getValue() != null ? e.getValue().accept(this) : ConstantNode.create(RMissing.instance);
index++;
}
return CallNode.createCall(call.getSource(), ReadVariableNode.create(call.getName(), true, false), CallArgumentsNode.create(nodes, argumentNames));
return RCallNode.createCall(call.getSource(), ReadVariableNode.create(call.getName(), true, false), CallArgumentsNode.create(nodes, argumentNames));
}
@Override
......@@ -148,14 +148,14 @@ public final class RTruffleVisitor extends BasicVisitor<RNode> {
@Override
public RNode visit(UnaryOperation op) {
RNode operand = op.getLHS().accept(this);
return CallNode.createStaticCall(op.getSource(), op.getPrettyOperator(), CallArgumentsNode.createUnnamed(operand));
return RCallNode.createStaticCall(op.getSource(), op.getPrettyOperator(), CallArgumentsNode.createUnnamed(operand));
}
@Override
public RNode visit(BinaryOperation op) {
RNode left = op.getLHS().accept(this);
RNode right = op.getRHS().accept(this);
return CallNode.createStaticCall(op.getSource(), op.getPrettyOperator(), CallArgumentsNode.createUnnamed(left, right));
return RCallNode.createStaticCall(op.getSource(), op.getPrettyOperator(), CallArgumentsNode.createUnnamed(left, right));
}
@Override
......@@ -287,7 +287,7 @@ public final class RTruffleVisitor extends BasicVisitor<RNode> {
// replacement function call (use visitor for FunctionCall)
FunctionCall rfCall = new FunctionCall(null, f.getName(), rfArgs);
CallNode replacementFunctionCall = (CallNode) visit(rfCall);
RCallNode replacementFunctionCall = (RCallNode) visit(rfCall);
// assign v, read a
WriteVariableNode vAssign = WriteVariableNode.create(vSymbol, replacementFunctionCall, false, n.isSuper());
......
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java
+ 4
− 4
View file @ e6418645
......@@ -36,7 +36,7 @@ import com.oracle.truffle.r.runtime.data.*;
@NodeField(name = "builtin", type = RBuiltinFactory.class)
@NodeChild(value = "arguments", type = RNode[].class)
public abstract class RBuiltinNode extends CallNode {
public abstract class RBuiltinNode extends RCallNode {
public String getSourceCode() {
return "<builtin>";
......@@ -99,7 +99,7 @@ public abstract class RBuiltinNode extends CallNode {
}
}
public CallNode inline(CallArgumentsNode args) {
public RCallNode inline(CallArgumentsNode args) {
RNode[] builtinArguments;
// static number of arguments
builtinArguments = inlineStaticArguments(args);
......@@ -248,11 +248,11 @@ public abstract class RBuiltinNode extends CallNode {
public static class RSnippetNode extends RCustomBuiltinNode {
@Child protected CallNode snippetCall;
@Child protected RCallNode snippetCall;
public RSnippetNode(RNode[] arguments, RBuiltinFactory builtin, FunctionExpressionNode function) {
super(arguments, builtin);
snippetCall = adoptChild(CallNode.createCall(function, CallArgumentsNode.create(getArguments(), new String[]{})));
snippetCall = adoptChild(RCallNode.createCall(function, CallArgumentsNode.create(getArguments(), new String[]{})));
assignSourceSection(((DefaultCallTarget) ((FunctionExpressionNode.StaticFunctionExpressionNode) function).getFunction().getTarget()).getRootNode().getSourceSection());
}
......
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinRootNode.java
+ 1
− 1
View file @ e6418645
......@@ -40,7 +40,7 @@ public final class RBuiltinRootNode extends RRootNode {
return builtin.execute(frame);
}
public CallNode inline(CallArgumentsNode args) {
public RCallNode inline(CallArgumentsNode args) {
return builtin.inline(args);
}
......
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Recall.java
+ 2
− 2
View file @ e6418645
......@@ -41,7 +41,7 @@ public class Recall extends RCustomBuiltinNode {
return PARAMETER_NAMES;
}
@Child private CallNode callNode;
@Child private RCallNode callNode;
public Recall(RBuiltinNode prev) {
super(prev);
......@@ -52,7 +52,7 @@ public class Recall extends RCustomBuiltinNode {
RFunction function = RArguments.get(frame).getFunction();
if (callNode == null) {
CompilerDirectives.transferToInterpreter();
callNode = adoptChild(CallNode.createCall(null, CallArgumentsNode.createUnnamed(((CallNode.VarArgsNode) unwrap(arguments[0])).getArgumentNodes())));
callNode = adoptChild(RCallNode.createCall(null, CallArgumentsNode.createUnnamed(((RCallNode.VarArgsNode) unwrap(arguments[0])).getArgumentNodes())));
arguments[0] = null;
}
return callNode.execute(frame, function);
......
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/SApply.java
+ 4
− 4
View file @ e6418645
......@@ -43,7 +43,7 @@ public abstract class SApply extends RBuiltinNode {
private static final Object[] PARAMETER_NAMES = new Object[]{"X", "FUN", "USE.NAMES"};
@Child private CallNode callNode;
@Child private RCallNode callNode;
@Child private WriteVariableNode writeNode;
@Child private CastStringNode castString;
......@@ -201,7 +201,7 @@ public abstract class SApply extends RBuiltinNode {
private Object call(VirtualFrame frame, RFunction function) {
if (callNode == null) {
CompilerDirectives.transferToInterpreter();
callNode = adoptChild(CallNode.createCall(null, CallArgumentsNode.createUnnamed(ReadVariableNode.create(temporaryVariableSymbol, false, false))));
callNode = adoptChild(RCallNode.createCall(null, CallArgumentsNode.createUnnamed(ReadVariableNode.create(temporaryVariableSymbol, false, false))));
}
return callNode.execute(frame, function);
}
......@@ -209,7 +209,7 @@ public abstract class SApply extends RBuiltinNode {
private int callInt(VirtualFrame frame, RFunction function) throws UnexpectedResultException {
if (callNode == null) {
CompilerDirectives.transferToInterpreter();
callNode = adoptChild(CallNode.createCall(null, CallArgumentsNode.createUnnamed(ReadVariableNode.create(temporaryVariableSymbol, false, false))));
callNode = adoptChild(RCallNode.createCall(null, CallArgumentsNode.createUnnamed(ReadVariableNode.create(temporaryVariableSymbol, false, false))));
}
return RTypesGen.RTYPES.expectInteger(callNode.execute(frame, function));
}
......@@ -217,7 +217,7 @@ public abstract class SApply extends RBuiltinNode {
private double callDouble(VirtualFrame frame, RFunction function) throws UnexpectedResultException {
if (callNode == null) {
CompilerDirectives.transferToInterpreter();
callNode = adoptChild(CallNode.createCall(null, CallArgumentsNode.createUnnamed(ReadVariableNode.create(temporaryVariableSymbol, false, false))));
callNode = adoptChild(RCallNode.createCall(null, CallArgumentsNode.createUnnamed(ReadVariableNode.create(temporaryVariableSymbol, false, false))));
}
return RTypesGen.RTYPES.expectDouble(callNode.execute(frame, function));
}
......
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/CallNode.java → com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallNode.java
+ 16
− 16
View file @ e6418645
......@@ -35,11 +35,11 @@ import com.oracle.truffle.r.nodes.builtin.*;
import com.oracle.truffle.r.runtime.*;
import com.oracle.truffle.r.runtime.data.*;
public abstract class CallNode extends RNode {
public abstract class RCallNode extends RNode {
private static final int INLINE_CACHE_SIZE = 4;
protected CallNode() {
protected RCallNode() {
}
@Override
......@@ -61,22 +61,22 @@ public abstract class CallNode extends RNode {
return RTypesGen.RTYPES.expectDouble(execute(frame, function));
}
public static CallNode createStaticCall(String function, CallArgumentsNode arguments) {
return CallNode.createCall(ReadVariableNode.create(function, true, false), arguments);
public static RCallNode createStaticCall(String function, CallArgumentsNode arguments) {
return RCallNode.createCall(ReadVariableNode.create(function, true, false), arguments);
}
public static CallNode createStaticCall(SourceSection src, String function, CallArgumentsNode arguments) {
CallNode cn = createStaticCall(function, arguments);
public static RCallNode createStaticCall(SourceSection src, String function, CallArgumentsNode arguments) {
RCallNode cn = createStaticCall(function, arguments);
cn.assignSourceSection(src);
return cn;
}
public static CallNode createCall(RNode function, CallArgumentsNode arguments) {
public static RCallNode createCall(RNode function, CallArgumentsNode arguments) {
return new UninitializedCallNode(function, arguments);
}
public static CallNode createCall(SourceSection src, RNode function, CallArgumentsNode arguments) {
CallNode cn = new UninitializedCallNode(function, arguments);
public static RCallNode createCall(SourceSection src, RNode function, CallArgumentsNode arguments) {
RCallNode cn = new UninitializedCallNode(function, arguments);
cn.assignSourceSection(src);
return cn;
}
......@@ -91,7 +91,7 @@ public abstract class CallNode extends RNode {
return null;
}
private abstract static class RootCallNode extends CallNode {
private abstract static class RootCallNode extends RCallNode {
@Child protected RNode functionNode;
......@@ -128,11 +128,11 @@ public abstract class CallNode extends RNode {
public static final class CachedCallNode extends RootCallNode {
@Child protected RootCallNode nextNode;
@Child protected CallNode currentNode;
@Child protected RCallNode currentNode;
private final RFunction function;
private final CallTarget target;
public CachedCallNode(RNode function, CallNode current, RootCallNode next, RFunction cachedFunction) {
public CachedCallNode(RNode function, RCallNode current, RootCallNode next, RFunction cachedFunction) {
super(function);
this.currentNode = adoptChild(current);
this.nextNode = adoptChild(next);
......@@ -200,11 +200,11 @@ public abstract class CallNode extends RNode {
return specialize(function).execute(frame, function);
}
private CallNode specialize(RFunction function) {
private RCallNode specialize(RFunction function) {
CompilerAsserts.neverPartOfCompilation();
if (depth < INLINE_CACHE_SIZE) {
final CallNode current = createCacheNode(function);
final RCallNode current = createCacheNode(function);
final RootCallNode cachedNode = new CachedCallNode(this.functionNode, current, new UninitializedCallNode(this), function);
current.onCreate();
this.replace(cachedNode);
......@@ -225,7 +225,7 @@ public abstract class CallNode extends RNode {
return parentNode;
}
protected CallNode createCacheNode(RFunction function) {
protected RCallNode createCacheNode(RFunction function) {
CallArgumentsNode clonedArgs = NodeUtil.cloneNode(args);
clonedArgs = permuteArguments(function, clonedArgs, clonedArgs.getNames());
......@@ -257,7 +257,7 @@ public abstract class CallNode extends RNode {
}
}
private static class DispatchedCallNode extends CallNode {
private static class DispatchedCallNode extends RCallNode {
@Child protected CallArgumentsNode arguments;
protected final RFunction function;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment