Remove flexFitR workaround; now fixed in flexFitR

Author: HenrikBengtsson

DESCRIPTION

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

R/dofuture_OP.R

@@ -366,9 +366,6 @@ doFuture2 <- function(obj, expr, envir, data) {   #nolint
     mprint(expr)
   }
 
-  ## Patch expression for flexFitR?
-  expr <- flexFitR_patch(expr)
-
   ## WORKAROUND: foreach::times() passes an empty string in 'argnames'
   argnames <- it$argnames
   argnames <- argnames[nzchar(argnames)]
@@ -429,13 +426,6 @@ doFuture2 <- function(obj, expr, envir, data) {   #nolint
   assign("...future.x_ii", 42, envir = globals_envir, inherits = FALSE)
   add <- c(add, "...future.x_ii")
 
-  if (isTRUE(attr(expr, "patched"))) {
-    if (debug) mdebug(" - flexFitR patch: rename global 'fn' to 'fn2'")
-    value <- globalsByName("fn", envir = envir)$fn
-    assign("fn2", value, envir = globals_envir, inherits = FALSE)
-    add <- c(add, "fn2")
-  }
-
   ignore <- attr(globals, "ignore", exact = TRUE)
   ignore <- c(ignore, argnames)
 

R/zzz.R

@@ -19,10 +19,6 @@ patch_expressions <- function() {
       if ("WARDEN" %in% loadedNamespaces()) {
         patches <- c(patches, "WARDEN")
       }
-      ## Package 'flexFitR'
-      if ("flexFitR" %in% loadedNamespaces()) {
-        patches <- c(patches, "flexFitR")
-      }
     }
     options(doFuture.patches = patches)
   }
@@ -41,41 +37,6 @@ patch_expressions <- function() {
 }
 
 
-flexFitR_tweak_modeler_expr <- function(expr) {
-  if (!is.call(expr)) return(expr)
-  expr <- unclass(expr)
-  op <- expr[[1]]
-  if (!is.symbol(op)) return(expr)
-  if (length(expr) != 3L) return(expr)
-  e <- expr[[3]]
-  if (length(e) != 10L) return(expr)
-  op <- e[[1]]
-  if (!is.symbol(op)) return(expr)
-  if (as.character(op) != ".fitter_curve") return(expr)
-  op <- e[[4]]
-  if (!is.symbol(op)) return(expr)
-  if (as.character(op) != "fn") return(expr)
-  e[[4]] <- as.symbol("fn2")
-  expr[[3]] <- e
-  attr(expr, "patched") <- TRUE
-  expr
-}
-
-flexFitR_patch <- local({
-  patch <- NULL
-  function(expr) {
-    if (is.null(patch)) {
-      patch_expressions()
-      patches <- getOption("doFuture.patches")
-      patch <<- ("flexFitR" %in% patches)
-    }
-    if (!patch) return(expr)
-    expr <- flexFitR_tweak_modeler_expr(expr)
-    expr
-  }
-})
-
-
 ## covr: skip=all
 .onLoad <- function(libname, pkgname) {
   value <- getOption("doFuture.workarounds")