Merge pull request #934 from tidyverse/f-890-refactor-3

Refactor

Author: krlmlr

R/subsetting.R

@@ -169,7 +169,7 @@ NULL
   # Side effect: check scalar
   if (!is.symbol(j)) {
     if (!is.vector(j) || length(j) != 1L || is.na(j) || (is.numeric(j) && j < 0) || is.logical(j)) {
-      vectbl_as_col_location2(j, length(x) + 1L, j_arg = j_arg, assign = TRUE)
+      vectbl_as_col_location2(j, length(x), j_arg = j_arg, assign = TRUE)
     }
   }
 
@@ -178,9 +178,9 @@ NULL
   # New columns are added to the end, provide index to avoid matching column
   # names again
   value <- list(value)
-  names(value) <- names(j)
 
-  tbl_subassign(x, i, j, value, i_arg = i_arg, j_arg = j_arg, value_arg = value_arg)
+  # j is already pretty
+  tbl_subassign(x, i, j, value, i_arg = i_arg, j_arg = NULL, value_arg = value_arg)
 }
 
 
@@ -449,8 +449,6 @@ tbl_subassign <- function(x, i, j, value, i_arg, j_arg, value_arg) {
       # Fill up columns if necessary
       if (has_length(new)) {
         init <- map(value[new], vec_slice, rep(NA_integer_, fast_nrow(x)))
-        names(init) <- coalesce2(names2(j)[new], names2(value)[new])
-
         x <- tbl_subassign_col(x, j[new], init)
       }
 
@@ -603,7 +601,7 @@ tbl_subassign_col <- function(x, j, value) {
   new <- which(j > length(x))
   if (has_length(new)) {
     length(x) <- max(j[new])
-    names(x)[ j[new] ] <- coalesce2(names2(j)[new], names2(value)[new])
+    names(x)[ j[new] ] <- names2(j)[new]
   }
 
   # Update
@@ -620,12 +618,6 @@ tbl_subassign_col <- function(x, j, value) {
   set_tibble_class(x, nrow)
 }
 
-coalesce2 <- function(x, y) {
-  use_y <- which(is.na(x))
-  x[use_y] <- y[use_y]
-  x
-}
-
 tbl_expand_to_nrow <- function(x, i) {
   nrow <- fast_nrow(x)