From acd01a41354be48af33bfcd89fcbd4a25e8c1dd9 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 17 Jun 2016 12:34:33 +0200
Subject: [PATCH] Minor fix: Choose use idiomatic Utils.incMod
---
.../src/com/oracle/truffle/r/nodes/builtin/base/Choose.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Choose.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Choose.java
index 98118afde7..66726c7678 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Choose.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Choose.java
@@ -32,6 +32,7 @@ import com.oracle.truffle.r.runtime.RBuiltinKind;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RError.Message;
import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.Utils;
import com.oracle.truffle.r.runtime.data.RDataFactory;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
@@ -91,8 +92,8 @@ public abstract class Choose extends RBuiltinNode {
for (int i = 0, nIdx = 0, kIdx = 0; i < resultLen; i++) {
result[i] = choose(getN.applyAsDouble(nIdx), getK.applyAsInt(kIdx));
complete &= result[i] != RRuntime.DOUBLE_NA;
- nIdx = (nIdx + 1) % nLength;
- kIdx = (kIdx + 1) % kLength;
+ nIdx = Utils.incMod(nIdx, nLength);
+ kIdx = Utils.incMod(kIdx, kLength);
}
return RDataFactory.createDoubleVector(result, complete);
}
--
GitLab