From 454dcdcc06f772a056360f0bc9026e2d866a26ad Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 10 Nov 2014 21:01:09 -0800
Subject: [PATCH] preserve names in which
---
.../oracle/truffle/r/nodes/builtin/base/WhichFunctions.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/WhichFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/WhichFunctions.java
index ee32d4b062..5395974b3f 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/WhichFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/WhichFunctions.java
@@ -47,12 +47,12 @@ import static com.oracle.truffle.r.runtime.RBuiltinKind.INTERNAL;
*/
public class WhichFunctions {
- @RBuiltin(name = "which", kind = INTERNAL, parameterNames = {"x", "arr.ind", "useNames"})
+ @RBuiltin(name = "which", kind = INTERNAL, parameterNames = {"x"})
public abstract static class Which extends RBuiltinNode {
@Override
public RNode[] getParameterValues() {
- return new RNode[]{ConstantNode.create(RMissing.instance), ConstantNode.create(RRuntime.LOGICAL_FALSE), ConstantNode.create(RRuntime.LOGICAL_TRUE)};
+ return new RNode[]{ConstantNode.create(RMissing.instance)};
}
@Specialization
@@ -69,7 +69,7 @@ public class WhichFunctions {
for (int i = 0; i < result.length; ++i) {
result[i] = w.get(i) + 1;
}
- return RDataFactory.createIntVector(result, RDataFactory.COMPLETE_VECTOR);
+ return RDataFactory.createIntVector(result, RDataFactory.COMPLETE_VECTOR, x.getNames());
}
}
--
GitLab