s/sapply/vapply.

git-svn-id: https://svn.r-project.org/R/trunk@88302 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: hornik

src/library/base/R/dynload.R

@@ -151,16 +151,15 @@ function(x, ...)
     x <- x[n > 0]
     n <- max(n)
     d <- list()
-    sapply(names(x),
-             function(id) {
-		d[[id]] <<- rep.int("", n)
-		names <- vapply(x[[id]], `[[`, "", "name")
-                if(length(names)) d[[id]][seq_along(names)] <<- names
-                d[[paste(id, "numParameters")]] <<- rep.int("", n)
-                names <- vapply(x[[id]], `[[`, 0L, "numParameters")
-                if(length(names))
-                    d[[paste(id, "numParameters")]][seq_along(names)] <<- names
-             })
+    for(id in names(x)) {
+        d[[id]] <- rep.int("", n)
+        names <- vapply(x[[id]], `[[`, "", "name")
+        if(length(names)) d[[id]][seq_along(names)] <- names
+        d[[paste(id, "numParameters")]] <- rep.int("", n)
+        names <- vapply(x[[id]], `[[`, 0L, "numParameters")
+        if(length(names))
+            d[[paste(id, "numParameters")]][seq_along(names)] <- names
+    }
     print(as.data.frame(d), ...)
     invisible(x)
 }

src/library/tools/R/QC.R

@@ -3190,7 +3190,7 @@ function(dir, force_suggests = TRUE, check_incoming = FALSE,
             installed_in <- c(installed_in, rep.int(lib, length(pkgs)))
         }
         if (length(lreqs)) {
-            reqs <- unique(sapply(lreqs, `[[`, 1L))
+            reqs <- unique(vapply(lreqs, `[[`, "", 1L))
             bad <- setdiff(reqs, installed)
             if(length(bad)) {
                 ## EDanalysis has a package in all of Depends, Imports, Suggests.
@@ -3226,12 +3226,12 @@ function(dir, force_suggests = TRUE, check_incoming = FALSE,
         if (length(lenhances) &&
             !config_val_to_logical(Sys.getenv("_R_CHECK_PACKAGE_DEPENDS_IGNORE_MISSING_ENHANCES_",
                                              "FALSE"))) {
-            m <- setdiff(sapply(lenhances, `[[`, 1L), installed)
+            m <- setdiff(vapply(lenhances, `[[`, "", 1L), installed)
             if(length(m))
                 bad_depends$enhances_but_not_installed <- m
         }
         if (!force_suggests && length(lsuggests)) {
-            m <- setdiff(sapply(lsuggests, `[[`, 1L), installed)
+            m <- setdiff(vapply(lsuggests, `[[`, "", 1L), installed)
             if(length(m))
                 bad_depends$suggests_but_not_installed <- m
         }
@@ -3345,12 +3345,12 @@ function(dir, force_suggests = TRUE, check_incoming = FALSE,
         ## First use dependencies which are installed: strict dependencies
         ## need to be for a full check.
         ## Suggests might not even exist, so we suppress warnings.
-        mt <- utils::maintainer
-        strict2 <- sapply(strict, function(x) suppressWarnings(mt(x)))
+        mt <- function(x) suppressWarnings(utils::maintainer(x))
+        strict2 <- vapply(strict, mt, "")
         miss1 <- is.na(strict2)
         weak <- setdiff(as.character(suggests),
                         bad_depends$suggested_but_not_installed)
-        weak2 <- sapply(weak, function(x) suppressWarnings(mt(x)))
+        weak2 <- vapply(weak, mt, "")
         miss2 <- is.na(weak2)
         if((any(miss1) || any(miss2)) &&
            !inherits(tryCatch(db <- CRAN_package_db()[, c("Package",

src/library/tools/R/install.R

@@ -1222,9 +1222,12 @@ if(FALSE) {
                     if (!is.na(use_C))
                         ev1 <- c(sprintf(c("CC%s", "C%sFLAGS"), use_C),
                                  ev[-(1:2)])
-                    ev2 <- sapply(ev1, function(x)
-                        system2(file.path(R.home("bin"), "R"), c("CMD", "config", x),
-                                stdout = TRUE))
+                    ev2 <- vapply(ev1,
+                                  function(x)
+                                      system2(file.path(R.home("bin"), "R"),
+                                              c("CMD", "config", x),
+                                              stdout = TRUE),
+                                  "")
                     ev3 <- paste0(ev, "=", shQuote(ev2))
                     ## skip any which are empty, possible for CXX)
                     ev3 <- ev3[nzchar(ev2)]

src/library/utils/R/package.skeleton.R

@@ -217,33 +217,27 @@ package.skeleton <-
 		      file.path(docs_dir,
 				sprintf("%s-package.Rd", name)),
 		      lib.loc = path)
-	vapply(list,
-	       function(item) {
-		   prompt(get(item, envir = environment),
-			  name = item,
-			  filename =
-			  file.path(docs_dir,
-				    sprintf("%s.Rd", list0[item])))
-	       },
-               "")
-	vapply(classesList,
-	       function(item) {
-		   methods::promptClass(item,
-					filename =
-					file.path(docs_dir,
-						  sprintf("%s-class.Rd", classes0[item])),
-					where = environment)
-	       },
-               "")
-	vapply(methodsList,
-	       function(item) {
-		   methods::promptMethods(item,
-					  filename =
-					  file.path(docs_dir,
-						    sprintf("%s-methods.Rd", methods0[item])),
-					  methods::findMethods(item, where = environment))
-	       },
-               "")
+        for(item in list) {
+            prompt(get(item, envir = environment),
+                   name = item,
+                   filename =
+                       file.path(docs_dir,
+                                 sprintf("%s.Rd", list0[item])))
+        }
+        for(item in classesList) {
+            methods::promptClass(item,
+                                 filename =
+                                     file.path(docs_dir,
+                                               sprintf("%s-class.Rd", classes0[item])),
+                                 where = environment)
+        }
+        for(item in methodsList) {
+            methods::promptMethods(item,
+                                   filename =
+                                       file.path(docs_dir,
+                                                 sprintf("%s-methods.Rd", methods0[item])),
+                                   methods::findMethods(item, where = environment))
+        }
     }))
     ## don't document generic functions from other packages
     for(item in methodsList) {

src/library/utils/R/sessionInfo.R

@@ -157,9 +157,9 @@ print.sessionInfo <- function(x, locale = TRUE, tzone = locale,
 			      ...)
 {
     mkLabel <- function(L, n) {
-        vers <- sapply(L[[n]], function(x) x[["Version"]])
-        pkg <-  sapply(L[[n]], function(x) x[["Package"]])
-        paste(pkg, vers, sep = "_")
+        paste(vapply(L[[n]], `[[`, "", "Package"),
+              vapply(L[[n]], `[[`, "", "Version"),
+              sep = "_")
     }
 
     cat(x$R.version$version.string, "\n", sep = "")