Skip to content

fix unary Ops methods: -, +, ! #490

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

Open
t-kalinowski wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix unary Ops methods: -, +, ! #490

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a995ea
fix unary Ops methods: -, +, !
t-kalinowski Nov 6, 2024
0ad14b6
also check `missing(e2)` in fallback.
t-kalinowski Nov 6, 2024
f75e089
add test
t-kalinowski Nov 6, 2024
7bcf831
Merged origin/main into fix-unary-Ops
hadley Jul 27, 2026
bf7eef8
Move return inside
hadley Jul 27, 2026
c0b21fc
Add test and really fix
hadley Jul 27, 2026
46dd722
Handle `!`
hadley Jul 27, 2026
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
9 changes: 7 additions & 2 deletions R/method-ops.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ on_load_define_ops <- function() {
#' @export
Ops.S7_object <- function(e1, e2) {
cnd <- tryCatch(
return(base_ops[[.Generic]](e1, e2)),
return(
if (missing(e2))
base_ops[[.Generic]](e1)
Comment thread
hadley marked this conversation as resolved.
Outdated
else
base_ops[[.Generic]](e1, e2)
),
S7_error_method_not_found = function(cnd) cnd
)

if (S7_inherits(e1) && S7_inherits(e2)) {
if (S7_inherits(e1) && (missing(e2) || S7_inherits(e2))) {
stop(cnd)
} else {
# Must call NextMethod() directly in the method, not wrapped in an
Expand Down
10 changes: 10 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 @@ -122,3 +122,13 @@ test_that("Ops methods can use super", {

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


test_that("Unary Ops methods work", {
Double := new_class(class_double)
method(`-`, list(Double, class_missing)) <- function(e1, e2) {
Double(-as.double(e1))
}

expect_identical(-Double(1), Double(-1))
})