FIX: Undo do.call(..., quote = TRUE) because it introduced other problems. Now using expr = quote(expr) to save it from do.call()

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.10.0-9030
+Version: 0.10.0-9031
 Depends:
     R (>= 3.2.0),
     parallelly,

R/BatchtoolsSSHFuture-class.R

@@ -20,13 +20,14 @@ BatchtoolsSSHFuture <- function(expr = NULL, substitute = TRUE, envir = parent.f
   if (length(keep) > 0) dotdotdot <- dotdotdot[-keep]
 
   args <- list(
-    expr = expr, substitute = FALSE, envir = envir,
+    expr = quote(expr),  ## Avoid 'expr' being resolved by do.call()
+    substitute = FALSE, envir = envir,
     workers = workers,
     cluster.functions = cluster.functions
   )
   if (length(dotdotdot) > 0) args <- c(args, dotdotdot)
 
-  future <- do.call(BatchtoolsCustomFuture, args = args, quote = TRUE)
+  future <- do.call(BatchtoolsCustomFuture, args = args)
 
   future <- structure(future, class = c("BatchtoolsSSHFuture", class(future)))
 

R/batchtools_template.R

@@ -212,7 +212,8 @@ batchtools_by_template <- function(expr, envir = parent.frame(),
   if (length(keep) > 0) dotdotdot <- dotdotdot[-keep]
 
   args <- list(
-    expr = expr, substitute = FALSE, envir = envir,
+    expr = quote(expr),  ## Avoid 'expr' being resolved by do.call()
+    substitute = FALSE, envir = envir,
     globals = globals,
     label = label,
     cluster.functions = cluster.functions,
@@ -221,7 +222,7 @@ batchtools_by_template <- function(expr, envir = parent.frame(),
     workers = workers
   )
   if (length(dotdotdot) > 0) args <- c(args, dotdotdot)
-  future <- do.call(constructor, args = args, quote = TRUE)
+  future <- do.call(constructor, args = args)
 
   if (!future$lazy) future <- run(future)