From 114dd3061afd2e74db4a5e621a0067722bb8fc0a Mon Sep 17 00:00:00 2001 From: Lukas Stadler <lukas.stadler@oracle.com> Date: Mon, 21 Nov 2016 11:17:38 +0100 Subject: [PATCH] minor refactoring in RCallSpecialNode --- .../r/nodes/function/RCallSpecialNode.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallSpecialNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallSpecialNode.java index 830bf51331..9834af4dee 100644 --- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallSpecialNode.java +++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/RCallSpecialNode.java @@ -197,16 +197,17 @@ public final class RCallSpecialNode extends RCallBaseNode implements RSyntaxNode } RNode[] localArguments = new RNode[arguments.length]; for (int i = 0; i < arguments.length; i++) { + RSyntaxNode arg = arguments[i]; if (inReplace && contains(ignoredArguments, i)) { - localArguments[i] = arguments[i].asRNode(); + localArguments[i] = arg.asRNode(); } else { - if (arguments[i] instanceof RSyntaxLookup) { - localArguments[i] = new PeekLocalVariableNode(((RSyntaxLookup) arguments[i]).getIdentifier()); - } else if (arguments[i] instanceof RSyntaxConstant) { - localArguments[i] = RContext.getASTBuilder().process(arguments[i]).asRNode(); + if (arg instanceof RSyntaxLookup) { + localArguments[i] = new PeekLocalVariableNode(((RSyntaxLookup) arg).getIdentifier()); + } else if (arg instanceof RSyntaxConstant) { + localArguments[i] = RContext.getASTBuilder().process(arg).asRNode(); } else { - assert arguments[i] instanceof RCallSpecialNode; - localArguments[i] = arguments[i].asRNode(); + assert arg instanceof RCallSpecialNode; + localArguments[i] = arg.asRNode(); } } } -- GitLab