Simplify globals assignment => drop support for tricky recursive globals

Author: HenrikBengtsson

R/expressions.R

@@ -452,7 +452,7 @@ evalFuture <- function(
     names <- names(globals)
     envs <- list()
     oldEnvs <- list()
-    env <- envir
+    env <- globalenv()
     repeat {
       if (identical(env, emptyenv())) break
       if (isNamespace(env)) {

R/globals.R

@@ -223,6 +223,7 @@ getGlobalsAndPackages <- function(expr, envir = parent.frame(), tweak = tweakExp
         }
         globals <- globals[-idxs[!keep]]
         if (debug) {
+          names <- names(globals)
           idxs <- which(names == "future.call.arguments")
           mdebugf("- 'future.call.arguments' global entries:")
           mstr(globals[idxs])

tests/globals,tricky_recursive.R

@@ -70,14 +70,14 @@ for (strategy in supportedStrategies()) {
   str(list(x2 = x2))
   stopifnot(identical(x2, x0))
 
-  y <- main_futureCall()
-  str(list(y = y))
-  if (is.null(y0)) y0 <- y
-  stopifnot(identical(y, y0))
-
-  y2 <- main_futureCall_no_FUN()
-  str(list(y2 = y2))
-  stopifnot(identical(y2, y0))
+#  y <- main_futureCall()
+#  str(list(y = y))
+#  if (is.null(y0)) y0 <- y
+#  stopifnot(identical(y, y0))
+
+#  y2 <- main_futureCall_no_FUN()
+#  str(list(y2 = y2))
+#  stopifnot(identical(y2, y0))
 
   z <- main_lapply()
   str(list(z = z))