simplify

Author: ben-schwen

R/bmerge.R

@@ -34,8 +34,8 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
     ans
   }
 
-  cast_with_atts = function(x, f) {
-    ans = f(x)
+  cast_with_atts = function(x, as.f) {
+    ans = as.f(x)
     if (!is.null(attributes(x))) attributes(ans) = attributes(x)
     ans
   }
@@ -113,8 +113,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
           # we've always coerced to int and returned int, for convenience.
           if (length(ic_idx)>1L) {
             xc_idx = xcols[ic_idx]
-            for (b in which(vapply_1c(x[0L, xc_idx, with=FALSE], getClass) == "double")) {
-              xb = xcols[b]
+            for (xb in xcols[which(vapply_1c(x[0L, xc_idx, with=FALSE], getClass) == "double")]) {
               if (isReallyReal(x[[xb]])) {
                 coerce_x = FALSE
                 break
@@ -128,8 +127,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
             set(callersi, j=ic, value=val)       # change the shallow copy of i up in [.data.table to reflect in the result, too.
             if (length(ic_idx)>1L) {
               xc_idx = xcols[ic_idx]
-              for (b in which(vapply_1c(x[0L, xc_idx, with=FALSE], getClass) == "double")) {
-                xb = xcols[b]
+              for (xb in xcols[which(vapply_1c(x[0L, xc_idx, with=FALSE], getClass) == "double")]) {
                 if (verbose) catf("Coercing double column %s (which contains no fractions) to type integer to match type of %s.\n", paste0("x.", names(x)[xb]), xname)
                 set(x, j=xb, value=cast_with_atts(x[[xb]], as.integer))
               }
@@ -146,8 +144,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
         set(i, j=ic, value=val)
         if (length(ic_idx)>1L) {
           xc_idx = xcols[ic_idx]
-          for (b in which(vapply_1c(x[0L, xc_idx, with=FALSE], getClass) == "integer")) {
-            xb = xcols[b]
+          for (xb in xcols[which(vapply_1c(x[0L, xc_idx, with=FALSE], getClass) == "integer")]) {
             if (verbose) catf("Coercing integer column %s to type double for join to match type of %s.\n", paste0("x.", names(x)[xb]), xname)
             set(x, j=xb, value=cast_with_atts(x[[xb]], as.double))
           }