Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing S7_super method for Ops #359

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Add missing S7_super method for Ops #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d416e73
Add missing S7_super method for Ops
hadley Sep 15, 2023
5678b41
Merge commit '0b7300e397558f76567e903effb83176a5cba872'
hadley Nov 23, 2023
0267d5a
Fix merge mistake
hadley Nov 23, 2023
2c18e83
Implement other Ops methods
hadley Nov 29, 2023
47dd393
Merge branch 'main' into ops-super
hadley Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ S3method("[[",S7_object)
S3method("[[<-",S7_object)
S3method("|",S7_class)
S3method(Ops,S7_object)
S3method(Ops,S7_super)
S3method(c,S7_class)
S3method(print,S7_S3_class)
S3method(print,S7_any)
Expand Down Expand Up @@ -86,7 +87,9 @@ if (getRversion() < "4.3.0") export(`@`)
if (getRversion() >= "4.3.0" && !is.null(asNamespace("utils")$.AtNames)) S3method(utils::.AtNames,S7_object)
if (getRversion() >= "4.3.0") S3method(base::`@`, S7_object)
if (getRversion() >= "4.3.0") S3method(chooseOpsMethod, S7_object)
if (getRversion() >= "4.3.0") S3method(chooseOpsMethod, S7_super)
if (getRversion() >= "4.3.0") S3method(matrixOps, S7_object)
if (getRversion() >= "4.3.0") S3method(matrixOps, S7_super)
if (getRversion() >= "4.3.0") S3method(nameOfClass, S7_class, S7_class_name)
importFrom(stats,setNames)
importFrom(utils,getFromNamespace)
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# S7 (development version)

* `super()` now works with Ops methods (#357).

* `method()` now generates an informative message when dispatch fails (#387).

* S7 provides a new automatic backward compatibility mechanism to provide
Expand Down
9 changes: 9 additions & 0 deletions R/method-ops.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,12 @@ chooseOpsMethod.S7_object <- function(x, y, mx, my, cl, reverse) TRUE
matrixOps.S7_object <- function(x, y) {
base_matrix_ops[[.Generic]](x, y)
}

#' @export
Ops.S7_super <- Ops.S7_object

#' @rawNamespace if (getRversion() >= "4.3.0") S3method(chooseOpsMethod, S7_super)
chooseOpsMethod.S7_super <- chooseOpsMethod.S7_object

#' @rawNamespace if (getRversion() >= "4.3.0") S3method(matrixOps, S7_super)
matrixOps.S7_super <- matrixOps.S7_object
13 changes: 13 additions & 0 deletions tests/testthat/test-method-ops.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,16 @@ test_that("`%*%` dispatches to S7 methods", {
expect_equal(1 %*% ClassX(), "class_any %*% ClassX")
})

test_that("Ops methods can use super", {
foo <- new_class("foo", class_integer)
foo2 <- new_class("foo2", foo)

method(`+`, list(foo, class_double)) <- function(e1, e2) {
foo(S7_data(e1) + as.integer(e2))
}
method(`+`, list(foo2, class_double)) <- function(e1, e2) {
foo2(super(e1, foo) + e2)
}

expect_equal(foo2(1L) + 1, foo2(2L))
})
Loading