Skip to content

Commit c4d0f0d

Browse files
committed
Try to fix check note about S3
1 parent f7f6a83 commit c4d0f0d

File tree

1 file changed

+30
-21
lines changed

1 file changed

+30
-21
lines changed

R/transform_plan.R

+30-21
Original file line numberDiff line numberDiff line change
@@ -560,11 +560,11 @@ parse_transform <- function(transform, target) {
560560
)
561561
}
562562

563-
assert_good_transform <- function(...) UseMethod("assert_good_transform")
563+
assert_good_transform <- function(transform, target) UseMethod("assert_good_transform")
564564

565565
assert_good_transform.map <-
566566
assert_good_transform.cross <-
567-
assert_good_transform.combine <- function(...) NULL
567+
assert_good_transform.combine <- function(transform, target) NULL
568568

569569
assert_good_transform.default <- function(transform, target) {
570570
stop0(
@@ -573,7 +573,7 @@ assert_good_transform.default <- function(transform, target) {
573573
)
574574
}
575575

576-
interpret_transform <- function(...) UseMethod("interpret_transform")
576+
interpret_transform <- function(transform) UseMethod("interpret_transform")
577577

578578
interpret_transform.map <- function(transform) {
579579
structure(
@@ -584,7 +584,7 @@ interpret_transform.map <- function(transform) {
584584

585585
interpret_transform.cross <- interpret_transform.map
586586

587-
interpret_transform.combine <- function(transform, ...) {
587+
interpret_transform.combine <- function(transform) {
588588
structure(
589589
transform,
590590
combine = dsl_combine(transform),
@@ -624,7 +624,15 @@ check_group_names <- function(groups, protect) {
624624
}
625625
}
626626

627-
dsl_transform <- function(...) {
627+
dsl_transform <- function(
628+
transform,
629+
target,
630+
row,
631+
plan,
632+
graph,
633+
max_expand,
634+
...
635+
) {
628636
UseMethod("dsl_transform")
629637
}
630638

@@ -634,7 +642,8 @@ dsl_transform.map <- dsl_transform.cross <- function(
634642
row,
635643
plan,
636644
graph,
637-
max_expand
645+
max_expand,
646+
...
638647
) {
639648
groupings <- groupings(transform)
640649
grid <- dsl_grid(transform, groupings)
@@ -1042,7 +1051,7 @@ dsl_deps.combine <- function(transform) {
10421051
)
10431052
}
10441053

1045-
dsl_revdeps <- function(...) UseMethod("dsl_revdeps")
1054+
dsl_revdeps <- function(transform) UseMethod("dsl_revdeps")
10461055

10471056
dsl_revdeps.map <- function(transform) {
10481057
attr(transform, "revdeps") %|||% c(
@@ -1061,7 +1070,7 @@ dsl_revdeps.combine <- function(transform) {
10611070
)
10621071
}
10631072

1064-
dsl_grid <- function(...) UseMethod("dsl_grid")
1073+
dsl_grid <- function(transform, groupings) UseMethod("dsl_grid")
10651074

10661075
dsl_grid.map <- function(transform, groupings) {
10671076
tryCatch(
@@ -1086,17 +1095,17 @@ dsl_grid.cross <- function(transform, groupings) {
10861095
do.call(expand.grid, c(groupings, stringsAsFactors = FALSE))
10871096
}
10881097

1089-
groupings <- function(...) {
1098+
groupings <- function(transform) {
10901099
UseMethod("groupings")
10911100
}
10921101

10931102
groupings.map <- groupings.cross <- function(transform) {
10941103
c(new_groupings(transform), old_groupings(transform))
10951104
}
10961105

1097-
groupings.combine <- function(...) character(0)
1106+
groupings.combine <- function(transform) character(0)
10981107

1099-
old_groupings <- function(...) UseMethod("old_groupings")
1108+
old_groupings <- function(transform, plan = NULL) UseMethod("old_groupings")
11001109

11011110
old_groupings.map <- old_groupings.cross <- function(transform, plan = NULL) {
11021111
attr(transform, "old_groupings") %|||%
@@ -1108,7 +1117,7 @@ set_old_groupings <- function(transform, plan) {
11081117
transform
11091118
}
11101119

1111-
find_old_groupings <- function(...) UseMethod("find_old_groupings")
1120+
find_old_groupings <- function(transform, plan) UseMethod("find_old_groupings")
11121121

11131122
find_old_groupings.map <- function(transform, plan) {
11141123
group_names <- as.character(unnamed(lang(transform))[-1])
@@ -1165,7 +1174,7 @@ na_omit <- function(x) {
11651174

11661175
find_old_groupings.combine <- function(transform, plan) NULL
11671176

1168-
new_groupings <- function(...) UseMethod("new_groupings")
1177+
new_groupings <- function(transform) UseMethod("new_groupings")
11691178

11701179
new_groupings.map <- function(transform) {
11711180
attr <- attr(transform, "new_groupings")
@@ -1213,21 +1222,21 @@ long_deparse <- function(x, collapse = "\n") {
12131222
out
12141223
}
12151224

1216-
dsl_combine <- function(...) UseMethod("dsl_combine")
1225+
dsl_combine <- function(transform) UseMethod("dsl_combine")
12171226

12181227
dsl_combine.combine <- function(transform) {
12191228
attr(transform, "combine") %|||%
12201229
as.character(unnamed(lang(transform))[-1])
12211230
}
12221231

1223-
dsl_by <- function(...) UseMethod("dsl_by")
1232+
dsl_by <- function(transform) UseMethod("dsl_by")
12241233

12251234
dsl_by.combine <- function(transform) {
12261235
attr(transform, "by") %|||%
12271236
all.vars(lang(transform)[[".by"]], functions = FALSE)
12281237
}
12291238

1230-
dsl_id <- function(...) UseMethod("dsl_id")
1239+
dsl_id <- function(transform) UseMethod("dsl_id")
12311240

12321241
dsl_id.transform <- function(transform) {
12331242
if (!is.null(attr(transform, "id"))) {
@@ -1240,7 +1249,7 @@ dsl_id.transform <- function(transform) {
12401249
all.vars(out, functions = FALSE) %||% TRUE
12411250
}
12421251

1243-
dsl_names <- function(...) UseMethod("dsl_names")
1252+
dsl_names <- function(transform) UseMethod("dsl_names")
12441253

12451254
dsl_names.transform <- function(transform) {
12461255
if (!is.null(attr(transform, ".names"))) {
@@ -1249,25 +1258,25 @@ dsl_names.transform <- function(transform) {
12491258
eval(lang(transform)[[".names"]])
12501259
}
12511260

1252-
tag_in <- function(...) UseMethod("tag_in")
1261+
tag_in <- function(transform) UseMethod("tag_in")
12531262

12541263
tag_in.transform <- function(transform) {
12551264
attr(transform, "tag_in") %|||%
12561265
all.vars(lang(transform)[[".tag_in"]], functions = FALSE)
12571266
}
12581267

1259-
tag_out <- function(...) UseMethod("tag_out")
1268+
tag_out <- function(transform) UseMethod("tag_out")
12601269

12611270
tag_out.transform <- function(transform) {
12621271
attr(transform, "tag_out") %|||%
12631272
all.vars(lang(transform)[[".tag_out"]], functions = FALSE)
12641273
}
12651274

1266-
lang <- function(...) UseMethod("lang")
1275+
lang <- function(x) UseMethod("lang")
12671276

12681277
lang.command <- lang.transform <- function(x) x[[1]]
12691278

1270-
char <- function(...) UseMethod("char")
1279+
char <- function(x) UseMethod("char")
12711280

12721281
char.transform <- function(x) safe_deparse(lang(x), backtick = TRUE)
12731282

0 commit comments

Comments
 (0)