Assert no positional arguments in more places

Author: HenrikBengtsson

DESCRIPTION

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

R/BatchtoolsCustomFuture-class.R

@@ -2,10 +2,11 @@
 #' @export
 BatchtoolsCustomFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
-
+  assert_no_positional_args_but_first()
+  
   future <- BatchtoolsFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsCustomFuture", class(future)))
-  
+
   future
 }
 
@@ -15,6 +16,7 @@ BatchtoolsCustomFuture <- function(expr = NULL, substitute = TRUE, envir = paren
 #' @export
 BatchtoolsBashFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsCustomFuture(expr = expr, substitute = FALSE, envir = envir, ..., workers = 1L)
   future <- structure(future, class = c("BatchtoolsBashFuture", "BatchtoolsUniprocessFuture", class(future)))

R/BatchtoolsFuture-class.R

@@ -61,6 +61,7 @@ BatchtoolsFuture <- function(expr = NULL, envir = parent.frame(),
                              registry = list(),
                              ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   ## Record globals
   gp <- getGlobalsAndPackages(expr, envir = envir, globals = globals)

R/BatchtoolsMultiprocessFuture-class.R

@@ -2,6 +2,7 @@
 #' @export
 BatchtoolsMultiprocessFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsMultiprocessFuture", class(future)))
@@ -14,6 +15,7 @@ BatchtoolsMultiprocessFuture <- function(expr = NULL, substitute = TRUE, envir =
 #' @export
 BatchtoolsMulticoreFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsMultiprocessFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsMulticoreFuture", class(future)))
@@ -26,6 +28,7 @@ BatchtoolsMulticoreFuture <- function(expr = NULL, substitute = TRUE, envir = pa
 #' @export
 BatchtoolsTemplateFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsMultiprocessFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsTemplateFuture", class(future)))
@@ -50,6 +53,7 @@ BatchtoolsLsfFuture <- function(expr = NULL, substitute = TRUE, envir = parent.f
 #' @export
 BatchtoolsOpenLavaFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsTemplateFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsOpenLavaFuture", class(future)))
@@ -62,6 +66,7 @@ BatchtoolsOpenLavaFuture <- function(expr = NULL, substitute = TRUE, envir = par
 #' @export
 BatchtoolsSGEFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsTemplateFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsSGEFuture", class(future)))
@@ -86,6 +91,7 @@ BatchtoolsSlurmFuture <- function(expr = NULL, substitute = TRUE, envir = parent
 #' @export
 BatchtoolsTorqueFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsTemplateFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsTorqueFuture", class(future)))

R/BatchtoolsUniprocessFuture-class.R

@@ -2,6 +2,7 @@
 #' @export
 BatchtoolsUniprocessFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsFuture(expr = expr, substitute = FALSE, envir = envir, ..., workers = 1L)
   future <- structure(future, class = c("BatchtoolsUniprocessFuture", class(future)))
@@ -14,6 +15,7 @@ BatchtoolsUniprocessFuture <- function(expr = NULL, substitute = TRUE, envir = p
 #' @export
 BatchtoolsLocalFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsUniprocessFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsLocalFuture", class(future)))
@@ -26,6 +28,7 @@ BatchtoolsLocalFuture <- function(expr = NULL, substitute = TRUE, envir = parent
 #' @export
 BatchtoolsInteractiveFuture <- function(expr = NULL, substitute = TRUE, envir = parent.frame(), ...) {
   if (substitute) expr <- substitute(expr)
+  assert_no_positional_args_but_first()
 
   future <- BatchtoolsUniprocessFuture(expr = expr, substitute = FALSE, envir = envir, ...)
   future <- structure(future, class = c("BatchtoolsInteractiveFuture", class(future)))