Skip to content

Commit 7e44b6b

Browse files
setrev->setfrev
1 parent 1a56a2c commit 7e44b6b

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

R/as.data.table.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ as.data.table.array = function(x, keep.rownames=FALSE, key=NULL, sorted=TRUE, va
104104
dnx[nulldnx] = lapply(dx[nulldnx], seq_len) #3636
105105
dnx
106106
} else dnx
107-
setrev(val)
107+
setfrev(val)
108108
if (is.null(names(val)) || !any(nzchar(names(val))))
109109
setattr(val, 'names', paste0("V", frev(seq_along(val))))
110110
if (value.name %chin% names(val))

R/bmerge.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
110110
}
111111
if (x_merge_type=="integer64" || i_merge_type=="integer64") {
112112
nm = c(iname, xname)
113-
if (x_merge_type=="integer64") { w=i; wc=icol; wclass=i_merge_type; } else { w=x; wc=xcol; wclass=x_merge_type; setrev(nm) } # w is which to coerce
113+
if (x_merge_type=="integer64") { w=i; wc=icol; wclass=i_merge_type; } else { w=x; wc=xcol; wclass=x_merge_type; setfrev(nm) } # w is which to coerce
114114
if (wclass=="integer" || (wclass=="double" && fitsInInt64(w[[wc]]))) {
115115
from_detail = if (wclass == "double") gettext(" (which has integer64 representation, e.g. no fractions)") else ""
116116
coerce_col(w, wc, wclass, "integer64", nm[1L], nm[2L], from_detail, verbose=verbose)

R/utils.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ fctr = function(x, levels=unique(x), ..., sort=FALSE, rev=FALSE) {
226226
if (!isTRUEorFALSE(rev))
227227
stopf("argument 'rev' must be TRUE or FALSE")
228228
if (sort) levels = sort(levels)
229-
if (rev) setrev(levels)
229+
if (rev) setfrev(levels)
230230
factor(x, levels=levels, ...)
231231
}
232232

R/wrappers.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ fitsInInt64 = function(x) .Call(CfitsInInt64R, x)
2323
coerceAs = function(x, as, copy=TRUE) .Call(CcoerceAs, x, as, copy)
2424

2525
frev = function(x) .Call(Cfrev, x, TRUE)
26-
setrev = function(x) invisible(.Call(Cfrev, x, FALSE))
26+
setfrev = function(x) invisible(.Call(Cfrev, x, FALSE))

inst/tests/tests.Rraw

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if (exists("test.data.table", .GlobalEnv, inherits=FALSE)) {
7171
setcoalesce = data.table:::setcoalesce
7272
setdiff_ = data.table:::setdiff_
7373
setreordervec = data.table:::setreordervec
74-
setrev = data.table:::setrev
74+
setfrev = data.table:::setfrev
7575
shallow = data.table:::shallow # until exported
7676
.shallow = data.table:::.shallow
7777
split.data.table = data.table:::split.data.table
@@ -4228,7 +4228,7 @@ test(1159.6, setDT(x), error="Argument 'x' to 'setDT' should be a")
42284228
x <- list(1, 2:3)
42294229
test(1159.7, setDT(x), error="All elements in argument 'x' to 'setDT'")
42304230

4231-
# test 1160 was for setrev, now removed
4231+
# test 1160 was for setfrev, now removed
42324232

42334233
# tests for setreordervec
42344234
# integer
@@ -21439,23 +21439,23 @@ test(2331.05, frev(NULL), rev(NULL))
2143921439
test(2331.06, frev(character(5)), rev(character(5)))
2144021440
test(2331.07, frev(integer(0)), rev(integer(0)))
2144121441
test(2331.08, frev(list(1, "a")), rev(list(1, "a")))
21442-
test(2331.09, {x=c(0L, NA); setrev(x); x}, c(NA, 0L))
21443-
test(2331.10, {x=d; setrev(x); x}, c(-Inf, Inf, NaN, NA))
21444-
test(2331.11, {x=c(NA, 1, 0+2i); setrev(x); x}, c(0+2i, 1, NA))
21445-
test(2331.12, {x=as.raw(0:1); setrev(x); x}, as.raw(1:0))
21446-
test(2331.13, {x=NULL; setrev(x); x}, NULL)
21447-
test(2331.14, {x=character(5); setrev(x); x}, character(5))
21448-
test(2331.15, {x=integer(0); setrev(x); x}, integer(0))
21449-
test(2331.16, {x=list(1, "a"); setrev(x); x}, list("a", 1))
21442+
test(2331.09, {x=c(0L, NA); setfrev(x); x}, c(NA, 0L))
21443+
test(2331.10, {x=d; setfrev(x); x}, c(-Inf, Inf, NaN, NA))
21444+
test(2331.11, {x=c(NA, 1, 0+2i); setfrev(x); x}, c(0+2i, 1, NA))
21445+
test(2331.12, {x=as.raw(0:1); setfrev(x); x}, as.raw(1:0))
21446+
test(2331.13, {x=NULL; setfrev(x); x}, NULL)
21447+
test(2331.14, {x=character(5); setfrev(x); x}, character(5))
21448+
test(2331.15, {x=integer(0); setfrev(x); x}, integer(0))
21449+
test(2331.16, {x=list(1, "a"); setfrev(x); x}, list("a", 1))
2145021450
test(2331.17, frev(1:1e2), rev(1:1e2))
2145121451
# copy arguments
2145221452
x = 1:3
2145321453
test(2331.21, {frev(x); x}, 1:3)
21454-
test(2331.22, {setrev(x); x}, 3:1)
21455-
test(2331.23, address(x) == address(setrev(x)))
21454+
test(2331.22, {setfrev(x); x}, 3:1)
21455+
test(2331.23, address(x) == address(setfrev(x)))
2145621456
test(2331.24, address(x) != address(frev(x)))
2145721457
# do not alter on subsets
21458-
test(2331.25, {setrev(x[1:2]); x}, 1:3)
21458+
test(2331.25, {setfrev(x[1:2]); x}, 1:3)
2145921459
# levels
2146021460
f = as.factor(letters)
2146121461
test(2331.31, frev(f), rev(f))
@@ -21464,13 +21464,13 @@ test(2331.33, frev(as.IDate(1:10)), as.IDate(10:1))
2146421464
# names
2146521465
x = c(a=1L, b=2L, c=3L)
2146621466
test(2331.41, frev(x), rev(x))
21467-
test(2331.42, setrev(x), x)
21467+
test(2331.42, setfrev(x), x)
2146821468
# attributes
2146921469
x = structure(1:10, class = c("IDate", "Date"), att = 1L)
2147021470
test(2331.51, attr(frev(x), "att"), attr(rev(x), "att"))
2147121471
test(2331.52, class(frev(x)), class(rev(x)))
21472-
test(2331.53, attr(setrev(x), "att"), 1L)
21473-
test(2331.54, class(setrev(x)), c("IDate", "Date"))
21472+
test(2331.53, attr(setfrev(x), "att"), 1L)
21473+
test(2331.54, class(setfrev(x)), c("IDate", "Date"))
2147421474
x = structure(integer(0), att = 1L)
2147521475
test(2331.55, attr(frev(x), "att"), attr(rev(x), "att"))
2147621476
# errors
@@ -21479,7 +21479,7 @@ test(2331.62, frev(expression(1)), error="is not supported by frev")
2147921479
if (test_bit64) {
2148021480
x = as.integer64(c(1, NA, 3))
2148121481
test(2331.71, frev(x), rev(x))
21482-
test(2331.72, setrev(x), x)
21482+
test(2331.72, setfrev(x), x)
2148321483
}
2148421484
# support rotate idiom
2148521485
M1 = M2 = matrix(1:4, nrow=2)

0 commit comments

Comments
 (0)