Skip to content

Commit 0d8ae09

Browse files
rename R-side argument for readability?
1 parent 98696e9 commit 0d8ae09

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

R/bmerge.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
9292
if (xclass=="integer64" || iclass=="integer64") {
9393
nm = c(iname, xname)
9494
if (xclass=="integer64") { w=i; wc=ic; wclass=iclass; } else { w=x; wc=xc; wclass=xclass; nm=rev(nm) } # w is which to coerce
95-
if (wclass=="integer" || (wclass=="double" && !isReallyReal(w[[wc]], i64=TRUE))) {
95+
if (wclass=="integer" || (wclass=="double" && !isReallyReal(w[[wc]], vs='i64'))) {
9696
if (verbose) catf("Coercing %s column %s%s to type integer64 to match type of %s.\n", wclass, nm[1L], if (wclass=="double") " (which has integer64 representation, e.g. no fractions)" else "", nm[2L])
9797
set(w, j=wc, value=bit64::as.integer64(w[[wc]]))
9898
} else stopf("Incompatible join types: %s is type integer64 but %s is type double and cannot be coerced to integer64 (e.g. has fractions)", nm[2L], nm[1L])

R/wrappers.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ colnamesInt = function(x, cols, check_dups=FALSE, skip_absent=FALSE) .Call(Ccoln
1818
testMsg = function(status=0L, nx=2L, nk=2L) .Call(CtestMsgR, as.integer(status)[1L], as.integer(nx)[1L], as.integer(nk)[1L])
1919

2020
isRealReallyInt = function(x) .Call(CisRealReallyIntR, x)
21-
isReallyReal = function(x, i64=FALSE) .Call(CisReallyReal, x, i64)
21+
isReallyReal = function(x, vs='i32') .Call(CisReallyReal, x, identical(vs, 'i64'))
2222

2323
coerceAs = function(x, as, copy=TRUE) .Call(CcoerceAs, x, as, copy)

0 commit comments

Comments
 (0)