BUG FIX: with(registerDoFuture(), local = TRUE) produced error on 'argument "expr" is missing, with no default'

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: doFuture
-Version: 1.1.1-9004
+Version: 1.1.1-9005
 Title: Use Foreach to Parallelize via the Future Framework
 Depends:
     foreach (>= 1.5.0),

NEWS.md

@@ -2,6 +2,9 @@
 
 ## Bug Fixes
 
+ * `with(registerDoFuture(), local = TRUE)` produced error on
+   'argument "expr" is missing, with no default'.
+
  * Environment variable `R_DOFUTURE_DEBUG` did not set R option
    `doFuture.debug` as documented.
 

R/with.DoPar.R

@@ -16,7 +16,7 @@
 #' @param \ldots Not used.
 #'
 #' @returns
-#' Invisibly, the value of `expr`.
+#' Invisibly, the value of `expr` if `local = FALSE`, other NULL.
 #'
 #' @example incl/with.R
 #'
@@ -38,9 +38,9 @@ with.DoPar <- function(data, expr, ..., local = FALSE, envir = parent.frame()) {
     call <- as.call(list(undoDoPar))
     args <- list(call, add = TRUE, after = TRUE)
     do.call(base::on.exit, args = args, envir = envir)
+    invisible(NULL)
   } else {
     on.exit(undoDoPar())
+    invisible(eval(expr, envir = envir, enclos = baseenv()))
   }
-
-  invisible(eval(expr, envir = envir, enclos = baseenv()))
 }

inst/testme/test-with.DoPar.R

@@ -0,0 +1,42 @@
+#' @tags with
+#' @tags %dopar%
+#' @tags sequential multisession
+
+library(doFuture)
+
+foreach::registerDoSEQ()
+stopifnot(foreach::getDoParName() == "doSEQ")
+
+with(registerDoFuture(), {
+  stopifnot(foreach::getDoParName() == "doFuture")
+})
+stopifnot(foreach::getDoParName() == "doSEQ")
+
+with(registerDoFuture("%dopar%"), {
+  stopifnot(foreach::getDoParName() == "doFuture")
+})
+stopifnot(foreach::getDoParName() == "doSEQ")
+
+with(registerDoFuture("%dofuture%"), {
+  stopifnot(foreach::getDoParName() == "doFuture2")
+})
+stopifnot(foreach::getDoParName() == "doSEQ")
+
+
+local({
+  with(registerDoFuture(), local = TRUE)
+  stopifnot(foreach::getDoParName() == "doFuture")
+})
+stopifnot(foreach::getDoParName() == "doSEQ")
+
+local({
+  with(registerDoFuture("%dopar%"), local = TRUE)
+  stopifnot(foreach::getDoParName() == "doFuture")
+})
+stopifnot(foreach::getDoParName() == "doSEQ")
+
+local({
+  with(registerDoFuture("%dofuture%"), local = TRUE)
+  stopifnot(foreach::getDoParName() == "doFuture2")
+})
+stopifnot(foreach::getDoParName() == "doSEQ")

man/with.DoPar.Rd

@@ -0,0 +1,3 @@
+## This runs testme test script inst/testme/test-with.DoPar.R
+## Don't edit - it was autogenerated by inst/testme/deploy.R
+doFuture:::testme("with.DoPar")