Merge 403a5a4 into bde4043

haozhu233 · Feb 11, 2019 · ab68e51 · ab68e51
2 parents bde4043 + 403a5a4
commit ab68e51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/R/ezsummary.r b/R/ezsummary.r
@@ -47,8 +47,8 @@ ezsummary <- function(tbl, ..., mode = c("ez", "details")){
             'pass the value in as a data frame using `select` from dplyr.')
   }
 
-  group_name <- attributes(tbl)$vars
-  var_name <- attributes(tbl)$names
+  group_name <- group_vars(tbl)
+  var_name <- tbl_vars(tbl)
   if (!is.null(group_name)){
     group_name <- as.character(group_name)
     var_name <- var_name[!var_name %in% group_name]

diff --git a/R/ezsummary_categorical.r b/R/ezsummary_categorical.r
@@ -92,8 +92,8 @@ ezsummary_categorical <- function(
   flavor <- match.arg(flavor)
 
   # Try to obtain grouping and variable information from the input tbl
-  group_name <- attributes(tbl)$vars
-  var_name <- attributes(tbl)$names
+  group_name <- group_vars(tbl)
+  var_name <- tbl_vars(tbl)
   if (!is.null(group_name)){
     group_name <- as.character(group_name)
     var_name <- var_name[!var_name %in% group_name]

diff --git a/R/ezsummary_quantitative.r b/R/ezsummary_quantitative.r
@@ -88,8 +88,8 @@ ezsummary_quantitative <- function(
             'pass the value in as a data frame using `select` from dplyr.')
   }
 
-  group_name <- attributes(tbl)$vars
-  var_name <- attributes(tbl)$names
+  group_name <- group_vars(tbl)
+  var_name <- tbl_vars(tbl)
   if (!is.null(group_name)){
     group_name <- as.character(group_name)
     var_name <- var_name[!var_name %in% group_name]