Skip to content

Commit 23cd06a

Browse files
committed
fix: remove as.character from call comparison
1 parent 77b036d commit 23cd06a

File tree

1 file changed

+20
-19
lines changed
  • src/library/tools/R

1 file changed

+20
-19
lines changed

src/library/tools/R/QC.R

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,34 +2381,35 @@ function(x, ...)
23812381

23822382
### Additional functions for checkS3methods
23832383
checkTopLevelCall <- function(expr, fun_name) {
2384-
if (inherits(expr, "if") || !is.call(expr)) {
2385-
return(FALSE)
2386-
}
2387-
fun_name <- as.name(fun_name)
2388-
fun_called <- expr[[1]]
2389-
if (is.call(fun_called)) {
2390-
inner_called <- fun_called[[1]]
2391-
if (as.character(inner_called) %in% c(":::", "::")) {
2392-
fun_called <- fun_called[[3]]
2384+
if (inherits(expr, "if") || !is.call(expr)) {
2385+
return(FALSE)
23932386
}
2394-
}
2395-
identical(fun_called, fun_name)
2387+
fun_name <- as.name(fun_name)
2388+
fun_called <- expr[[1]]
2389+
if (is.call(fun_called)) {
2390+
inner_called <- fun_called[[1]
2391+
if (identical(inner_called, quote(`:::`)) ||
2392+
identical(inner_called, quote(`::`))) {
2393+
fun_called <- fun_called[[3]]
2394+
}
2395+
}
2396+
identical(fun_called, fun_name)
23962397
}
23972398

23982399
containsTopLevelCall <- function(x, fun_name) {
2399-
fun_body <- body(x)
2400-
if (inherits(fun_body, "{")) {
2401-
any(vapply(fun_body, checkTopLevelCall, TRUE, fun = fun_name))
2402-
} else {
2403-
checkTopLevelCall(fun_body, fun_name)
2404-
}
2400+
fun_body <- body(x)
2401+
if (inherits(fun_body, "{")) {
2402+
any(vapply(fun_body, checkTopLevelCall, TRUE, fun = fun_name))
2403+
} else {
2404+
checkTopLevelCall(fun_body, fun_name)
2405+
}
24052406
}
24062407

24072408
isDeprecated <- function(fun) {
2408-
containsTopLevelCall(fun, quote(.Deprecated))
2409+
containsTopLevelCall(fun, quote(.Deprecated))
24092410
}
24102411
isDefunct <- function(fun) {
2411-
containsTopLevelCall(fun, quote(.Defunct))
2412+
containsTopLevelCall(fun, quote(.Defunct))
24122413
}
24132414

24142415
### * checkS3methods

0 commit comments

Comments
 (0)