Merge pull request #691 from lorenzwalthert/minor-speed-improvements

- Minor speed improvements (#691).

Author: lorenzwalthert

R/compat-dplyr.R

@@ -52,16 +52,17 @@ filter <- function(.data, ...) {
   subset(.data, ...)
 }
 
-left_join <- function(x, y, by, ...) {
+left_join <- function(x, y, by) {
   if (rlang::is_named(by)) {
     by_x <- names(by)
     by_y <- unname(by)
   } else {
     by_x <- by_y <- by
   }
-  res <- as_tibble(merge(x, y, by.x = by_x, by.y = by_y, all.x = TRUE, ...))
-  res <- arrange(res, pos_id)
 
+  res <- merge(x, y, by.x = by_x, by.y = by_y, all.x = TRUE) %>%
+    arrange_pos_id()
+  res <- new_tibble(res, nrow = nrow(res))
   # dplyr::left_join set unknown list columns to NULL, merge sets them
   # to NA
   if (exists("child", res) && any(is.na(res$child))) {

R/compat-tidyr.R

@@ -6,5 +6,5 @@ nest_ <- function(data, key_col, nest_cols = character()) {
   res <- list()
   res[[key_column]] <- key_levels
   res[[key_col]] <- split(data[, nest_cols], key_factor)
-  as_tibble(res)
+  new_tibble(res, nrow = length(key_levels))
 }

R/indent.R

@@ -306,7 +306,7 @@ pd_is_multi_line <- function(pd) {
 #' @seealso choose_indention
 #' @keywords internal
 update_newlines <- function(pd) {
-  npd <- nrow(pd) - 1
-  pd$newlines[seq_len(npd)] <- pd$lag_newlines[seq_len(npd) + 1]
+  seq_pd <- seq_len(nrow(pd) - 1)
+  pd$newlines[seq_pd] <- pd$lag_newlines[seq_pd + 1]
   pd
 }

R/initialize.R

@@ -52,8 +52,7 @@ initialize_spaces <- function(pd_flat) {
     rep(0L, nrow(pd_flat)), pd_flat$col2
   )
   pd_flat$spaces <- pd_flat$col3 - pd_flat$col2_nl - 1L
-  pd_flat$col3 <- NULL
-  pd_flat$col2_nl <- NULL
+  pd_flat$col3 <- pd_flat$col2_nl <- NULL
   pd_flat
 }
 

R/nest.R

@@ -312,14 +312,15 @@ remove_terminal_token_before_and_after <- function(pd_flat) {
 #' @return An integer vector of length spaces_after_prefix, which is either
 #'   one (if `force_one = TRUE`) or `space_after_prefix` with all values
 #'   below one set to one.
+#' @return
+#' Numeric vector indicating the number of spaces.
 #' @keywords internal
 set_spaces <- function(spaces_after_prefix, force_one) {
   if (force_one) {
-    n_of_spaces <- rep(1, length(spaces_after_prefix))
+    rep(1, length(spaces_after_prefix))
   } else {
-    n_of_spaces <- pmax(spaces_after_prefix, 1L)
+    pmax(spaces_after_prefix, 1L)
   }
-  n_of_spaces
 }
 
 #' Nest a flat parse table

R/transform-files.R

@@ -259,7 +259,10 @@ parse_transform_serialize_r <- function(text,
 apply_transformers <- function(pd_nested, transformers) {
   transformed_updated_multi_line <- post_visit(
     pd_nested,
-    c(transformers$initialize, transformers$line_break, set_multi_line, update_newlines)
+    c(
+      transformers$initialize, transformers$line_break, set_multi_line,
+      if (!is.null(transformers$line_break)) update_newlines
+    )
   )
 
   transformed_all <- pre_visit(