change to frev/setrev

Author: ben-schwen

R/wrappers.R

@@ -17,7 +17,5 @@ isReallyReal = function(x) .Call(CisReallyReal, x)
 
 coerceAs = function(x, as, copy=TRUE) .Call(CcoerceAs, x, as, copy)
 
-frev = function(x, copy=TRUE) {
-  ans = .Call(Cfrev, x, copy)
-  if (isTRUE(copy)) ans else invisible(ans)
-}
+frev   = function(x) .Call(Cfrev, x, TRUE)
+setrev = function(x) invisible(.Call(Cfrev, x, FALSE))

inst/tests/tests.Rraw

@@ -18353,52 +18353,51 @@ if (test_bit64) {
 
 # 5885 implement frev
 d = c(NA, NaN, Inf, -Inf)
-test(2249.00, frev(c(FALSE, NA),    copy=TRUE), c(NA, FALSE))
-test(2249.01, frev(c(0L, NA),       copy=TRUE), c(NA, 0L))
-test(2249.02, frev(d,               copy=TRUE), c(-Inf, Inf, NaN, NA))
-test(2249.03, frev(c(NA, 1, 0+2i),  copy=TRUE), c(0+2i, 1, NA))
-test(2249.04, frev(as.raw(0:1),     copy=TRUE), as.raw(1:0))
-test(2249.05, frev(NULL,            copy=TRUE), NULL)
-test(2249.06, frev(character(5),    copy=TRUE), character(5))
-test(2249.07, frev(integer(0),      copy=TRUE), integer(0))
-test(2249.08, frev(list(1, "a"),    copy=TRUE), list("a", 1))
-test(2249.09, frev(c(0L, NA),       copy=FALSE), c(NA, 0L))
-test(2249.10, frev(d,               copy=FALSE), c(-Inf, Inf, NaN, NA))
-test(2249.11, frev(c(NA, 1, 0+2i),  copy=FALSE), c(0+2i, 1, NA))
-test(2249.12, frev(as.raw(0:1),     copy=FALSE), as.raw(1:0))
-test(2249.13, frev(NULL,            copy=FALSE), NULL)
-test(2249.14, frev(character(5),    copy=FALSE), character(5))
-test(2249.15, frev(integer(0),      copy=FALSE), integer(0))
-test(2249.16, frev(list(1, "a"),    copy=FALSE), list("a", 1))
-test(2249.17, frev(1:1e2,           copy=TRUE),  rev(1:1e2))
+test(2249.00, frev(c(FALSE, NA)),     c(NA, FALSE))
+test(2249.01, frev(c(0L, NA)),        c(NA, 0L))
+test(2249.02, frev(d),                c(-Inf, Inf, NaN, NA))
+test(2249.03, frev(c(NA, 1, 0+2i)),   c(0+2i, 1, NA))
+test(2249.04, frev(as.raw(0:1)),      as.raw(1:0))
+test(2249.05, frev(NULL),             NULL)
+test(2249.06, frev(character(5)),     character(5))
+test(2249.07, frev(integer(0)),       integer(0))
+test(2249.08, frev(list(1, "a")),     list("a", 1))
+test(2249.09, setrev(c(0L, NA)),      c(NA, 0L))
+test(2249.10, setrev(d),              c(-Inf, Inf, NaN, NA))
+test(2249.11, setrev(c(NA, 1, 0+2i)), c(0+2i, 1, NA))
+test(2249.12, setrev(as.raw(0:1)),    as.raw(1:0))
+test(2249.13, setrev(NULL),           NULL)
+test(2249.14, setrev(character(5)),   character(5))
+test(2249.15, setrev(integer(0)),     integer(0))
+test(2249.16, setrev(list(1, "a")),   list("a", 1))
+test(2249.17, frev(1:1e2),            rev(1:1e2))
 # copy arguments
 x = 1:3
-test(2249.21, {frev(x, copy=TRUE);  x}, 1:3)
-test(2249.22, {frev(x, copy=FALSE); x}, 3:1)
-test(2249.23, address(x) == address(frev(x, copy=FALSE)))
-test(2249.24, address(x) != address(frev(x, copy=TRUE)))
+test(2249.21, {frev(x);  x}, 1:3)
+test(2249.22, {setrev(x); x}, 3:1)
+test(2249.23, address(x) == address(setrev(x)))
+test(2249.24, address(x) != address(frev(x)))
 # do not alter on subsets
-test(2249.25, {frev(x[1:2], copy=FALSE);  x}, 1:3)
+test(2249.25, {setrev(x[1:2]);  x}, 1:3)
 # levels
 f = as.factor(letters)
-test(2249.31, frev(f, copy=TRUE), rev(f))
-test(2249.32, frev(as.IDate(1:10), copy=TRUE), as.IDate(10:1))
-test(2249.33, frev(as.IDate(1:10), copy=TRUE), as.IDate(10:1))
+test(2249.31, frev(f), rev(f))
+test(2249.32, frev(as.IDate(1:10)), as.IDate(10:1))
+test(2249.33, frev(as.IDate(1:10)), as.IDate(10:1))
 # names
 x = c(a=1L, b=2L, c=3L)
-test(2249.41, frev(x, copy=TRUE), rev(x))
-test(2249.42, frev(x, copy=FALSE), x)
+test(2249.41, frev(x), rev(x))
+test(2249.42, setrev(x), x)
 # attributes
 x = structure(1:10, class = c("IDate", "Date"), att = 1L)
-test(2249.51, attr(frev(x, copy=TRUE), "att"), 1L)
-test(2249.52, attr(frev(x, copy=FALSE), "att"), 1L)
+test(2249.51, attr(frev(x), "att"), 1L)
+test(2249.52, attr(setrev(x), "att"), 1L)
 # errors
 test(2249.61, frev(data.table()), error="should not be data.frame or data.table")
-test(2249.62, frev(1:2, copy=NA), error="must be TRUE or FALSE")
-test(2249.63, frev(expression(1)), error="is not supported by frev")
-test(2249.64, frev(matrix(1)), error="should not be matrix or array")
+test(2249.62, frev(expression(1)), error="is not supported by frev")
+test(2249.63, frev(matrix(1)), error="should not be matrix or array")
 if (test_bit64) {
   x = as.integer64(c(1, NA, 3))
-  test(2249.71, frev(x, copy=TRUE), rev(x))
-  test(2249.72, frev(x, copy=FALSE), x)
+  test(2249.71, frev(x), rev(x))
+  test(2249.72, setrev(x), x)
 }

src/utils.c

@@ -430,7 +430,7 @@ SEXP frev(SEXP x, SEXP copyArg) {
   if (!isNull(getAttrib(x, R_DimSymbol)))
     error(_("'x' should not be matrix or array"));
   if (!IS_TRUE_OR_FALSE(copyArg))
-    error(_("%s must be TRUE or FALSE."), "copy");
+    error(_("%s must be TRUE or FALSE."), "copy"); // # nocov
   bool copy = LOGICAL(copyArg)[0];
   R_xlen_t n = xlength(x);
   int nprotect = 0;