Skip to content

Commit 3ca2c81

Browse files
committed
Merge branch 'brk/a4_move_helpers' of github.com:Rdatatable/data.table into brk/a4_move_helpers
2 parents 4330a4f + 3c4d87f commit 3ca2c81

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎R/data.table.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,7 +2055,7 @@ replace_dot_alias = function(e) {
20552055
if (q3 > 0L) {
20562056
grplens = pmin.int(q3, len__)
20572057
g = lapply(g, rep.int, times=grplens)
2058-
} else if (.is_nrows(jsub)) {
2058+
} else if (.dt_is_nrows(jsub)) {
20592059
g = lapply(g, rep.int, times=len__)
20602060
# unpack list of lists for nrows functions
20612061
if (all(vapply_1b(ans, is.list))) {
@@ -2081,7 +2081,7 @@ replace_dot_alias = function(e) {
20812081
if (length(o__)) jrows = o__[jrows]
20822082
if (length(irows)) jrows = irows[jrows]
20832083
if (length(jvals)==1L) jvals = jvals[[1L]] # unwrap single column jvals for assign
2084-
if (.is_nrows(jsub)) { # 5403 unwrap multicolumn jvals for gfunctions that can return lists
2084+
if (.dt_is_nrows(jsub)) { # 5403 unwrap multicolumn jvals for gfunctions that can return lists
20852085
jvals = if (length(jvals) != length(lhs)) split(unlist(jvals), rep(seq_along(jvals[[1L]]), length(jvals))) else lapply(jvals, unlist)
20862086
}
20872087
.Call(Cassign, x, jrows, lhs, newnames, jvals)

‎R/translation.R‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ raise_condition = function(signal, message, classes, immediate=FALSE, appendLF=F
2121
signal(obj)
2222
}
2323

24+
.is_dt_helper_call = function(call) is.call(call) && is.name(f <- call[[1L]]) && startsWith(as.character(f), ".dt_")
25+
2426
stopf = function(fmt, ..., class=NULL, domain="R-data.table") {
2527
raise_condition(stop, gettextf(fmt, ..., domain=domain), c(class, "simpleError", "error", "condition"))
2628
}

0 commit comments

Comments
 (0)