update packages

lisp/ess/etc/ESSR/R/.basic.R

@@ -80,7 +80,7 @@
 .ess.helpLinks <- function(topic, package) {
     tryCatch(
         warning = function(...) NULL,
-        error = function(...) NULL,
+        error = function(...) NULL, # needs R >= 2.13.0
         {
             ast <- .ess.fetchParsedRd(topic, package)
             .ess.findLinks(ast)
@@ -156,7 +156,7 @@
 }
 
 .ess.strip.error <- function(msg, srcfile) {
-    pattern <- paste0(srcfile, ":[0-9]+:[0-9]+: ")
+    pattern <- paste(srcfile, ":[0-9]+:[0-9]+: ", sep = "")
     sub(pattern, "", msg)
 }
 
@@ -218,12 +218,12 @@ if(.ess.Rversion < "1.8")
         sink(getConnection(1))
 
     on.exit({
-        writeLines(paste0(sentinel, "-END"))
+        writeLines(paste(sentinel, "-END", sep = ""))
         if (sinked)
             sink(NULL)
     })
 
-    writeLines(paste0(sentinel, "-START"))
+    writeLines(paste(sentinel, "-START", sep = ""))
 
     .ess.environment.state$env <- parent.frame()
     on.exit(.ess.environment.state$env <- NULL, add = TRUE)

lisp/ess/etc/ESSR/R/.load.R

@@ -11,7 +11,7 @@
 ## load .base.R and all other files into ESSR environment; then attach ESSR
 .ess.ESSR.load <- function(dir) {
 
-    if (nzchar(Sys.getenv("ESSR_TEST_LOAD_ERROR")))
+    if (Sys.getenv("ESSR_TEST_LOAD_ERROR") != "")
         stop('Loading failed with a nice message.')
 
     Rver <- .ess.ESSR.get.rver()

lisp/ess/etc/ESSR/R/misc.R

@@ -158,7 +158,15 @@
     mode <- sapply(objs, data.class)
     length <- sapply(objs, length)
     size <- sapply(objs, function(obj) format(object.size(obj)))
-    d <- data.frame(mode, length, size)
+    rows <- sapply(objs,nrow)
+	# sapply returns a list rather than a vector if there are NULLs eg nrow returns NULL for non-dataframes.  
+	# check if list, replace NULLS with NA and convert to vector
+	if (is.list(rows)) {
+		rows[sapply(rows,is.null)] <- NA
+		rows <- unlist(rows)
+	}
+    
+    d <- data.frame(mode, length, rows, size)
     
     var.names <- row.names(d)