Skip to content

Commit dfdcd9b

Browse files
amend a new call site for isReallyReal
1 parent c81a1f7 commit dfdcd9b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

R/bmerge.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mergeType = function(x) {
44
ans = typeof(x)
55
if (ans=="integer") { if (is.factor(x)) ans = "factor" }
66
else if (ans=="double") { if (inherits(x, "integer64")) ans = "integer64" }
7-
# do not call isReallyReal(x) yet because i) if both types are double we don't need to coerce even if one or both sides
7+
# do not call isRealReallyInt*(x) yet because i) if both types are double we don't need to coerce even if one or both sides
88
# are int-as-double, and ii) to save calling it until we really need it
99
ans
1010
}
@@ -119,7 +119,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
119119
if (length(ic_idx)>1L) {
120120
xc_idx = xcols[ic_idx]
121121
for (xb in xc_idx[which(vapply_1c(.shallow(x, xc_idx), mergeType) == "double")]) {
122-
if (isReallyReal(x[[xb]])) {
122+
if (isRealReallyInt32(x[[xb]])) {
123123
coerce_x = FALSE
124124
break
125125
}

0 commit comments

Comments
 (0)