Fixes cl= 'future' with pbreplicate() #71

Signed-off-by: Peter Solymos <[email protected]>
psolymos · Sep 21, 2024 · 307f333 · 307f333
1 parent 428c519
commit 307f333
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # Version 1.7-3, July 16, 2024
 
 * Fixed initial message issue with Shiny (#69).
+* Fix: `pbreplicate` was not passing future related arguments (#71).
 
 # Version 1.7-2, June 27, 2023
 

diff --git a/R/pbreplicate.R b/R/pbreplicate.R
@@ -1,4 +1,4 @@
 pbreplicate <-
-function (n, expr, simplify = "array", cl = NULL)
+function (n, expr, simplify = "array", ..., cl = NULL)
 pbsapply(integer(n), eval.parent(substitute(function(...) expr)),
-    simplify = simplify, cl = cl)
+    simplify = simplify, ..., cl = cl)
diff --git a/man/pbapply.Rd b/man/pbapply.Rd
@@ -28,7 +28,7 @@ pbapply(X, MARGIN, FUN, ..., simplify = TRUE, cl = NULL)
 
 pbsapply(X, FUN, ..., simplify = TRUE, USE.NAMES = TRUE, cl = NULL)
 pbvapply(X, FUN, FUN.VALUE, ..., USE.NAMES = TRUE, cl = NULL)
-pbreplicate(n, expr, simplify = "array", cl = NULL)
+pbreplicate(n, expr, simplify = "array", ..., cl = NULL)
 
 .pb_env
 pbmapply(FUN, ..., MoreArgs = NULL, SIMPLIFY = TRUE, USE.NAMES = TRUE)

diff --git a/tests/tests.R b/tests/tests.R
@@ -22,9 +22,13 @@ example(pbapply, run.dontrun = TRUE)
 example(pboptions, run.dontrun = TRUE)
 
 ## check potential changes in formal arguments
-check_args <- function(fun1, fun2, cl=TRUE) {
+check_args <- function(fun1, fun2, cl=TRUE, dots=TRUE) {
     f1 <- formals(fun1)
     f2 <- formals(fun2)
+    if (!dots) {
+        f1 <- f1[names(f1) != "..."]
+        f2 <- f2[names(f2) != "..."]
+    }
     args1 <- names(f1)
     args2cl <- names(f2)
     args2 <- if (cl)
@@ -61,7 +65,7 @@ check_args(lapply, pblapply)
 check_args(lapply, pbwalk)
 check_args(apply, pbapply)
 check_args(sapply, pbsapply)
-check_args(replicate, pbreplicate)
+check_args(replicate, pbreplicate, dots=FALSE) # don't check ...
 check_args(tapply, pbtapply)
 check_args(eapply, pbeapply)
 check_args(vapply, pbvapply)