Apply omit_args also to default arguments

r-lib · Mar 6, 2023 · 3cf3234 · 3cf3234
1 parent 3b0bf3e
commit 3cf3234
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # memoise (development version)
 
+* `omit_args` now also works for default arguments (@mgirlich, #145).
+
 # memoise 2.0.1
 
 # Version 2.0.0.9000

diff --git a/R/memoise.R b/R/memoise.R
@@ -148,13 +148,13 @@ memoise <- memoize <- function(
     # That has not been called
     default_args <- default_args[setdiff(names(default_args), names(called_args))]
 
-    # Ignored specified arguments when hashing
-    called_args[encl$`_omit_args`] <- NULL
-
     # Evaluate all the arguments
     args <- c(lapply(called_args, eval, parent.frame()),
               lapply(default_args, eval, envir = environment()))
 
+    # Ignored specified arguments when hashing
+    args[encl$`_omit_args`] <- NULL
+
     key <- encl$`_hash`(
       c(
         encl$`_f_hash`,

diff --git a/tests/testthat/test-memoise.R b/tests/testthat/test-memoise.R
@@ -326,6 +326,20 @@ test_that("omit_args respected", {
   res2 <- mem_rnorm(10, mean = +100)
 
   expect_true(identical(res1, res2))
+
+  # Also works for default args
+  f <- function(n, x = rnorm(1)) {
+    rnorm(n)
+  }
+  mem_f <- memoise(f)
+  expect_false(identical(res1, res2))
+  res1 <- mem_f(1)
+  res2 <- mem_f(1)
+
+  mem_f2 <- memoise(f, omit_args = "x")
+  res1 <- mem_f2(1)
+  res2 <- mem_f2(1)
+  expect_true(identical(res1, res2))
 })
 
 context("has_cache")