Prune also functions local to other functions

Author: HenrikBengtsson

R/utils-prune_pkg_code.R

@@ -20,18 +20,24 @@ prune_fcns <- function(expr) {
   expr
 }
 
-#' @importFrom globals walkAST
-prune_pkg_code <- function(env = topenv(parent.frame())) {
-  names <- names(env)
-  for (name in names) {
-    if (exists(name, mode = "function", envir = env, inherits = FALSE)) {
-      fcn <- get(name, mode = "function", envir = env, inherits = FALSE)
-      body0 <- body(fcn)
-      body <- walkAST(body0, call = prune_fcns)
-      if (!identical(body, body0)) {
-        body(fcn) <- body
-        assign(name, fcn, envir = env, inherits = FALSE)
-      }
+prune_fcn <- function(name, envir) {
+  if (exists(name, mode = "function", envir = envir, inherits = FALSE)) {
+    fcn <- get(name, mode = "function", envir = envir, inherits = FALSE)
+    body0 <- body(fcn)
+    body <- walkAST(body0, call = prune_fcns)
+    if (!identical(body, body0)) {
+      body(fcn) <- body
+      assign(name, fcn, envir = envir, inherits = FALSE)
+      return(TRUE)
     }
   }
+  FALSE
+}
+
+#' @importFrom globals walkAST
+prune_pkg_code <- function(env = topenv(parent.frame())) {
+  res <- lapply(names(env), FUN = prune_fcn, envir = env)
+
+  env <- environment(plan)
+  res <- lapply(names(env), FUN = prune_fcn, envir = env)
 }