Merge branch 'feature/evalFuture' of github.com:HenrikBengtsson/futur…

…e into feature/evalFuture
futureverse · Jan 3, 2025 · 858dda6 · 858dda6
2 parents ea9fa69 + 7bdb606
commit 858dda6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/R/expressions.R b/R/expressions.R
@@ -314,7 +314,12 @@ evalFuture <- function(
   ## -----------------------------------------------------------------
   ## Evaluate expression in a local() environment?
   if (local) {
-    tmpl_expr_local <- bquote_compile(base::local(.(expr)))
+    tmpl_expr_local <- bquote_compile(base::local({
+      env <- base::environment()
+      base::attr(env, "name") <- "future:evalenv"
+      base::rm(list = "env")
+      .(expr)
+    }))
     expr <- bquote_apply(tmpl_expr_local)
     ## WORKAROUND: This makes assumption about withCallingHandlers()
     ## and local(). In case this changes, provide internal options to