update cedta dispatch

Author: ben-schwen

R/cedta.R

@@ -48,7 +48,7 @@ cedta.pkgEvalsUserCode = c("gWidgetsWWW","statET","FastRWeb","slidify","rmarkdow
 }
 
 # cedta = Calling Environment Data.Table-Aware
-cedta = function(n=2L) {
+cedta = function(n=2L, verbose = getOption("datatable.verbose", FALSE)) {
   # Calling Environment Data Table Aware
   env = parent.frame(n)
   if (isTRUEorFALSE(env$.datatable.aware)) { # dtplyr#184, #5654
@@ -72,7 +72,7 @@ cedta = function(n=2L) {
     (nsname %chin% cedta.pkgEvalsUserCode && .any_eval_calls_in_stack()) ||
     isTRUE(ns$.datatable.aware) ||  # As of Sep 2018: RCAS, caretEnsemble, dtplyr, rstanarm, rbokeh, CEMiTool, rqdatatable, RImmPort, BPRMeth, rlist
     tryCatch("data.table" %chin% get(".Depends",paste("package",nsname,sep=":"),inherits=FALSE),error=function(e)FALSE)  # both ns$.Depends and get(.Depends,ns) are not sufficient
-  if (!ans && getOption("datatable.verbose")) {
+  if (!ans && verbose) {
     # nocov start
     catf("cedta decided '%s' wasn't data.table aware. Here is call stack with [[1L]] applied:\n", nsname)
     print(sapply(sys.calls(), `[[`, 1L))

R/data.table.R

@@ -1,6 +1,6 @@
 dim.data.table = function(x)
 {
-  if (!cedta()) return(NextMethod()) # nocov
+  if (!cedta(verbose=FALSE)) return(NextMethod()) # nocov
   .Call(Cdim, x)
 }
 

R/print.data.table.R

@@ -72,7 +72,7 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"),
       setnames(index_dt, print_names)
     }
   }
-  n_x = nrow(x)
+  n_x = dim(x)[1L] # manually dispatch nrow() to avoid dispatching to S3 method
   if ((topn*2L+1L)<n_x && (n_x>nrows || !topnmiss)) {
     toprint = rbindlist(list(head(x, topn), tail(x, topn)), use.names=FALSE)  # no need to match names because head and tail of same x, and #3306
     rn = c(seq_len(topn), seq.int(to=n_x, length.out=topn))
@@ -143,7 +143,7 @@ print.data.table = function(x, topn=getOption("datatable.print.topn"),
   }
   if (col.names == "none")
     colnames(toprint) = rep.int("", ncol(toprint))
-  if (nrow(toprint)>20L && col.names == "auto")
+  if (NROW(toprint)>20L && col.names == "auto")
     # repeat colnames at the bottom if over 20 rows so you don't have to scroll up to see them
     #   option to shut this off per request of Oleg Bondar on SO, #1482
     toprint = rbind(
@@ -271,7 +271,7 @@ dt_width = function(x, nrow, class, row.names, col.names) {
 }
 # keeps the dim and dimnames attributes
 toprint_subset = function(x, cols_to_print) {
-  if (nrow(x) == 1L){
+  if (NROW(x) == 1L){
     atts = attributes(x)
     atts$dim = c(1L, sum(cols_to_print))
     atts$dimnames[[2L]] = atts$dimnames[[2L]][cols_to_print]