Merge branch 'master' into tbl-new-data-frame

Author: krlmlr

NAMESPACE

@@ -86,7 +86,6 @@ importFrom(pillar,type_sum)
 importFrom(pkgconfig,set_config)
 importFrom(utils,head)
 importFrom(utils,tail)
-importFrom(vctrs,"vec_slice<-")
 importFrom(vctrs,new_data_frame)
 importFrom(vctrs,new_rcrd)
 importFrom(vctrs,num_as_location)

R/new.R

@@ -60,7 +60,9 @@ new_tibble <- function(x, ..., nrow, class = NULL, subclass = NULL) {
   #' equal to this value.
   #' (But this is not checked by the constructor).
   #' This takes the place of the "row.names" attribute in a data frame.
-  if (!is_integerish(nrow, 1)) {
+  if (is_integerish(nrow, 1)) {
+    nrow <- as.integer(nrow)
+  } else {
     cnd_signal(error_new_tibble_needs_nrow())
   }
 
@@ -87,14 +89,25 @@ new_tibble <- function(x, ..., nrow, class = NULL, subclass = NULL) {
   #' but the names are not checked for correctness.
   if (length(x) == 0) {
     # Leaving this because creating a named list of length zero seems difficult
-    names(x) <- character()
-  } else if (is.null(names(x))) {
+    args[["names"]] <- character()
+  } else if (is.null(args[["names"]])) {
     cnd_signal(error_names_must_be_non_null())
   }
 
-  attr(x, "row.names") <- .set_row_names(nrow)
-  class(x) <- c(class[!class %in% tibble_class], tibble_class)
-  x
+  if (is.null(class)) {
+    class <- tibble_class_no_data_frame
+  } else {
+    class <- c(class[!class %in% tibble_class], tibble_class_no_data_frame)
+  }
+
+  slots <- c("x", "n", "class")
+  args[slots] <- list(x, nrow, class)
+
+  # `new_data_frame()` restores compact row names
+  args[["row.names"]] <- NULL
+
+  # do.call() is faster than exec() in this case
+  do.call(new_data_frame, args)
 }
 
 #' @description
@@ -148,6 +161,7 @@ validate_nrow <- function(names, lengths, nrow) {
 }
 
 tibble_class <- c("tbl_df", "tbl", "data.frame")
+tibble_class_no_data_frame <- c("tbl_df", "tbl")
 
 # Errors ------------------------------------------------------------------
 

R/print.R

@@ -19,7 +19,7 @@
 #' the printed output can be customized in various ways.
 #' See `vignette("extending", package = "pillar")` for details.
 #'
-#' @inheritSection pillar::`pillar-package` Package options
+#' @inherit pillar::pillar_options
 #' @section Package options:
 #'
 #' The following options control printing of `tbl` and `tbl_df` objects:

R/tibble-package.R

@@ -9,6 +9,7 @@
 #' @importFrom vctrs unspecified vec_as_subscript2 num_as_location vec_ptype_abbr
 #' @importFrom vctrs vec_names vec_names2 vec_set_names
 #' @importFrom vctrs new_rcrd
+#' @importFrom vctrs new_data_frame
 #' @aliases NULL tibble-package
 #' @details
 #' `r lifecycle::badge("stable")`
@@ -35,7 +36,6 @@
 #'   * Create a tibble: [tibble()], [as_tibble()], [tribble()], [enframe()]
 #'   * Inspect a tibble: [print.tbl()], [glimpse()]
 #'   * Details on the S3 `tbl_df` class: [`tbl_df-class`]
-#' @inheritSection formatting Package options
 #' @section Package options:
 #' The following option is used for viewing tabular data with `view()`:
 #' - `tibble.view_max`: Maximum number of rows shown if the input is not a