[GR-14535] GitHub issue #61: rep.int with zero length value argument.

PullRequest: fastr/1965

Author: steve-s

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0 RC 15
+
+Bug fixes:
+
+* `rep.int` with value argument of length 0 just returns the value argument
+
 # 1.0 RC 14
 
 * all FastR specific options (NOT those GNU-R compatible like `--save`) are experimental except for `--R.PrintErrorStacktracesToFile`,

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RepeatInternal.java

@@ -23,7 +23,6 @@
 package com.oracle.truffle.r.nodes.builtin.base;
 
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.abstractVectorValue;
-import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.notEmpty;
 import static com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef.typeName;
 import static com.oracle.truffle.r.runtime.builtins.RBehavior.PURE;
 import static com.oracle.truffle.r.runtime.builtins.RBuiltinKind.INTERNAL;
@@ -48,19 +47,24 @@
 public abstract class RepeatInternal extends RBuiltinNode.Arg2 {
 
     private final ConditionProfile timesOneProfile = ConditionProfile.createBinaryProfile();
+    private final ConditionProfile valueLen0Profile = ConditionProfile.createBinaryProfile();
 
     static {
         Casts casts = new Casts(RepeatInternal.class);
         casts.arg("x").mustBe(abstractVectorValue(), RError.Message.ATTEMPT_TO_REPLICATE, typeName());
-        casts.arg("times").defaultError(RError.Message.INVALID_TYPE, typeName(), "times", "vector").mustBe(abstractVectorValue()).asIntegerVector().mustBe(notEmpty(),
-                        RError.Message.INVALID_VALUE, "times");
+        casts.arg("times").defaultError(RError.Message.INVALID_TYPE, typeName(), "times", "vector").mustBe(abstractVectorValue()).asIntegerVector();
     }
 
     private RAbstractVector performRep(RAbstractVector value, RAbstractIntVector times, VectorFactory factory, VectorAccess valueAccess, VectorAccess timesAccess, VectorAccess resultAccess) {
         try (SequentialIterator valueIter = valueAccess.access(value); SequentialIterator timesIter = timesAccess.access(times)) {
             int valueLength = valueAccess.getLength(valueIter);
             int timesLength = timesAccess.getLength(timesIter);
-
+            if (valueLen0Profile.profile(valueLength == 0)) {
+                return factory.createVector(valueAccess.getType(), 0, false);
+            }
+            if (timesLength == 0) {
+                throw error(RError.Message.INVALID_VALUE, "times");
+            }
             RVector<?> result;
             if (timesOneProfile.profile(timesLength == 1)) {
                 timesAccess.next(timesIter);

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -59547,6 +59547,18 @@ Error in rep_len(function() 42, 7) : attempt to replicate non-vector
 #x<-as.raw(16); y<-as.raw(5); rep_len(c(x, y), 5)
 [1] 10 05 10 05 10
 
+##com.oracle.truffle.r.test.builtins.TestBuiltin_repint.testRepInt#
+#rep.int(character(0), numeric(0))
+character(0)
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_repint.testRepInt#
+#rep.int(integer(0), character(0))
+integer(0)
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_repint.testRepInt#
+#rep.int(integer(0), numeric(0))
+integer(0)
+
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_repint.testRepInt#
 #{ rep.int("a",3) }
 [1] "a" "a" "a"

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_repint.java

@@ -14,7 +14,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Copyright (c) 2012-2014, Purdue University
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates
  *
  * All rights reserved.
  */
@@ -188,6 +188,10 @@ public void testRepInt() {
         assertEval("{ rep.int(7, -4)  }");
         assertEval("{ rep.int(c(7,1), c(1,-4))  }");
         assertEval("{ rep.int(c(7,1), c(1,4,5))  }");
+
+        assertEval("rep.int(integer(0), character(0))");
+        assertEval("rep.int(integer(0), numeric(0))");
+        assertEval("rep.int(character(0), numeric(0))");
     }
 
     @Test