rename as_slide_computation func input to avoid name collisions

Author: nmdefries

R/utils.R

@@ -198,7 +198,7 @@ assert_sufficient_f_args <- function(f, ...) {
 #'
 #' @source https://github.com/r-lib/rlang/blob/c55f6027928d3104ed449e591e8a225fcaf55e13/R/fn.R#L343-L427
 #'
-#' @param x A function, one-sided formula, or quosure.
+#' @param .f A function, one-sided formula, or quosure.
 #'
 #'   If a **function** and `calc_ref_time_value` is `FALSE`, the function is
 #'   returned as-is, with no modifications. If `calc_ref_time_value` is
@@ -253,15 +253,15 @@ assert_sufficient_f_args <- function(f, ...) {
 #'  f_rhs is_formula caller_arg caller_env
 #'
 #' @noRd
-as_slide_computation <- function(x,
+as_slide_computation <- function(.f,
                         before,
                         calc_ref_time_value = FALSE,
                         ...,
-                        arg = caller_arg(x),
+                        arg = caller_arg(.f),
                         call = caller_env()) {
   # A quosure is a type of formula, so be careful with the order and contents
   # of the conditional logic here.
-  if (is_quosure(x)) {
+  if (is_quosure(.f)) {
     if (calc_ref_time_value) {
       f_wrapper = function(.x, .group_key, ...) {
         .ref_time_value = min(.x$time_value) + before
@@ -275,7 +275,7 @@ as_slide_computation <- function(x,
         data_mask$.x = .x
         data_mask$.group_key = .group_key
         data_mask$.ref_time_value = .ref_time_value
-        rlang::eval_tidy(x, data_mask)
+        rlang::eval_tidy(.f, data_mask)
       }
       return(f_wrapper)
     }
@@ -292,32 +292,32 @@ as_slide_computation <- function(x,
       data_mask$.x = .x
       data_mask$.group_key = .group_key
       data_mask$.ref_time_value = .ref_time_value
-      rlang::eval_tidy(x, data_mask)
+      rlang::eval_tidy(.f, data_mask)
     }
     return(f_wrapper)
   }
 
-  if (is_function(x) || is_formula(x)) {
-    if (is_function(x)) {
+  if (is_function(.f) || is_formula(.f)) {
+    if (is_function(.f)) {
       # Check that `f` takes enough args
-      assert_sufficient_f_args(x, ...)
-      fn <- x
+      assert_sufficient_f_args(.f, ...)
+      fn <- .f
     }
 
-    if (is_formula(x)) {
-      if (length(x) > 2) {
+    if (is_formula(.f)) {
+      if (length(.f) > 2) {
         Abort(sprintf("%s must be a one-sided formula", arg),
                 class = "epiprocess__as_slide_computation__formula_is_twosided",
-                epiprocess__x = x,
+                epiprocess__f = .f,
                 call = call)
       }
 
-      env <- f_env(x)
+      env <- f_env(.f)
       if (!is_environment(env)) {
         Abort("Formula must carry an environment.",
                 class = "epiprocess__as_slide_computation__formula_has_no_env",
-                epiprocess__x = x,
-                epiprocess__x_env = env,
+                epiprocess__f = .f,
+                epiprocess__f_env = env,
                 arg = arg, call = call)
       }
 
@@ -326,7 +326,7 @@ as_slide_computation <- function(x,
         .x = quote(..1), .y = quote(..2), .z = quote(..3),
         . = quote(..1), .group_key = quote(..2), .ref_time_value = quote(..3)
       )
-      fn <- new_function(args, f_rhs(x), env)
+      fn <- new_function(args, f_rhs(.f), env)
       fn <- structure(fn, class = c("epiprocess_slide_computation", "function"))
     }
 
@@ -343,10 +343,10 @@ as_slide_computation <- function(x,
     return(fn)
   }
 
-  Abort(sprintf("Can't convert a %s to a slide computation", class(x)),
+  Abort(sprintf("Can't convert a %s to a slide computation", class(.f)),
             class = "epiprocess__as_slide_computation__cant_convert_catchall",
-            epiprocess__x = x,
-            epiprocess__x_class = class(x),
+            epiprocess__f = .f,
+            epiprocess__f_class = class(.f),
             arg = arg,
             call = call)
 }