Merge branch 'main' into S7-external-generics

Author: t-kalinowski

R/S7.R

@@ -8,7 +8,7 @@ replacements_S7 <- function(env) {
       }
     }))
 
-  S7_methods_tbl <- attr(env[[".__S3MethodsTable__."]], "S7methods", TRUE)
+  S7_methods_tbl <- attr(env[[".__S3MethodsTable__."]], "S7methods", exact = TRUE)
   external_methods <- lapply(seq_along(S7_methods_tbl), function(i) {
     entry <- S7_methods_tbl[[i]]
     name <- external_generic_method_signature(entry$generic, entry$signature)
@@ -34,11 +34,11 @@ traverse_S7_generic <- function(x) {
         # Recurse for nested environments
         get_replacements(target_value)
       } else {
-        name <- as.character(attr(target_value, "name", TRUE) %||% name)
+        name <- as.character(attr(target_value, "name", exact = TRUE) %||% name)
         list(replacement(name, env, target_value))
       }
     })
-    unlist(replacements, FALSE, FALSE)
+    unlist(replacements, recursive = FALSE, use.names = FALSE)
   }
   get_replacements(S7::prop(x, "methods"))
 }
@@ -56,7 +56,7 @@ traverse_S7_class <- function(x) {
         }
       })
   })
-  prop_fun_replacements <- unlist(prop_fun_replacements, FALSE, FALSE)
+  prop_fun_replacements <- unlist(prop_fun_replacements, recursive = FALSE, use.names = FALSE)
 
   c(
     list(

tests/testthat/TestS7/R/foo.R

@@ -51,4 +51,4 @@ method(testthat_print, Range) <- function(x, ...) {
 
 .onLoad <- function(libname, pkgname) {
   S7::methods_register()
-}
+}

tests/testthat/TestS7/tests/testthat/test-foo.R

@@ -21,4 +21,4 @@ test_that("Range methods work", {
 
   # Test external generic method for testthat::testthat_print()
   expect_equal(testthat::capture_output(x, print = TRUE), "Range(1, 10)")
-})
+})