@@ -560,11 +560,11 @@ parse_transform <- function(transform, target) {
560
560
)
561
561
}
562
562
563
- assert_good_transform <- function (... ) UseMethod(" assert_good_transform" )
563
+ assert_good_transform <- function (transform , target ) UseMethod(" assert_good_transform" )
564
564
565
565
assert_good_transform.map <-
566
566
assert_good_transform.cross <-
567
- assert_good_transform.combine <- function (... ) NULL
567
+ assert_good_transform.combine <- function (transform , target ) NULL
568
568
569
569
assert_good_transform.default <- function (transform , target ) {
570
570
stop0(
@@ -573,7 +573,7 @@ assert_good_transform.default <- function(transform, target) {
573
573
)
574
574
}
575
575
576
- interpret_transform <- function (... ) UseMethod(" interpret_transform" )
576
+ interpret_transform <- function (transform ) UseMethod(" interpret_transform" )
577
577
578
578
interpret_transform.map <- function (transform ) {
579
579
structure(
@@ -584,7 +584,7 @@ interpret_transform.map <- function(transform) {
584
584
585
585
interpret_transform.cross <- interpret_transform.map
586
586
587
- interpret_transform.combine <- function (transform , ... ) {
587
+ interpret_transform.combine <- function (transform ) {
588
588
structure(
589
589
transform ,
590
590
combine = dsl_combine(transform ),
@@ -624,7 +624,15 @@ check_group_names <- function(groups, protect) {
624
624
}
625
625
}
626
626
627
- dsl_transform <- function (... ) {
627
+ dsl_transform <- function (
628
+ transform ,
629
+ target ,
630
+ row ,
631
+ plan ,
632
+ graph ,
633
+ max_expand ,
634
+ ...
635
+ ) {
628
636
UseMethod(" dsl_transform" )
629
637
}
630
638
@@ -634,7 +642,8 @@ dsl_transform.map <- dsl_transform.cross <- function(
634
642
row ,
635
643
plan ,
636
644
graph ,
637
- max_expand
645
+ max_expand ,
646
+ ...
638
647
) {
639
648
groupings <- groupings(transform )
640
649
grid <- dsl_grid(transform , groupings )
@@ -1042,7 +1051,7 @@ dsl_deps.combine <- function(transform) {
1042
1051
)
1043
1052
}
1044
1053
1045
- dsl_revdeps <- function (... ) UseMethod(" dsl_revdeps" )
1054
+ dsl_revdeps <- function (transform ) UseMethod(" dsl_revdeps" )
1046
1055
1047
1056
dsl_revdeps.map <- function (transform ) {
1048
1057
attr(transform , " revdeps" ) %||| % c(
@@ -1061,7 +1070,7 @@ dsl_revdeps.combine <- function(transform) {
1061
1070
)
1062
1071
}
1063
1072
1064
- dsl_grid <- function (... ) UseMethod(" dsl_grid" )
1073
+ dsl_grid <- function (transform , groupings ) UseMethod(" dsl_grid" )
1065
1074
1066
1075
dsl_grid.map <- function (transform , groupings ) {
1067
1076
tryCatch(
@@ -1086,17 +1095,17 @@ dsl_grid.cross <- function(transform, groupings) {
1086
1095
do.call(expand.grid , c(groupings , stringsAsFactors = FALSE ))
1087
1096
}
1088
1097
1089
- groupings <- function (... ) {
1098
+ groupings <- function (transform ) {
1090
1099
UseMethod(" groupings" )
1091
1100
}
1092
1101
1093
1102
groupings.map <- groupings.cross <- function (transform ) {
1094
1103
c(new_groupings(transform ), old_groupings(transform ))
1095
1104
}
1096
1105
1097
- groupings.combine <- function (... ) character (0 )
1106
+ groupings.combine <- function (transform ) character (0 )
1098
1107
1099
- old_groupings <- function (... ) UseMethod(" old_groupings" )
1108
+ old_groupings <- function (transform , plan = NULL ) UseMethod(" old_groupings" )
1100
1109
1101
1110
old_groupings.map <- old_groupings.cross <- function (transform , plan = NULL ) {
1102
1111
attr(transform , " old_groupings" ) %||| %
@@ -1108,7 +1117,7 @@ set_old_groupings <- function(transform, plan) {
1108
1117
transform
1109
1118
}
1110
1119
1111
- find_old_groupings <- function (... ) UseMethod(" find_old_groupings" )
1120
+ find_old_groupings <- function (transform , plan ) UseMethod(" find_old_groupings" )
1112
1121
1113
1122
find_old_groupings.map <- function (transform , plan ) {
1114
1123
group_names <- as.character(unnamed(lang(transform ))[- 1 ])
@@ -1165,7 +1174,7 @@ na_omit <- function(x) {
1165
1174
1166
1175
find_old_groupings.combine <- function (transform , plan ) NULL
1167
1176
1168
- new_groupings <- function (... ) UseMethod(" new_groupings" )
1177
+ new_groupings <- function (transform ) UseMethod(" new_groupings" )
1169
1178
1170
1179
new_groupings.map <- function (transform ) {
1171
1180
attr <- attr(transform , " new_groupings" )
@@ -1213,21 +1222,21 @@ long_deparse <- function(x, collapse = "\n") {
1213
1222
out
1214
1223
}
1215
1224
1216
- dsl_combine <- function (... ) UseMethod(" dsl_combine" )
1225
+ dsl_combine <- function (transform ) UseMethod(" dsl_combine" )
1217
1226
1218
1227
dsl_combine.combine <- function (transform ) {
1219
1228
attr(transform , " combine" ) %||| %
1220
1229
as.character(unnamed(lang(transform ))[- 1 ])
1221
1230
}
1222
1231
1223
- dsl_by <- function (... ) UseMethod(" dsl_by" )
1232
+ dsl_by <- function (transform ) UseMethod(" dsl_by" )
1224
1233
1225
1234
dsl_by.combine <- function (transform ) {
1226
1235
attr(transform , " by" ) %||| %
1227
1236
all.vars(lang(transform )[[" .by" ]], functions = FALSE )
1228
1237
}
1229
1238
1230
- dsl_id <- function (... ) UseMethod(" dsl_id" )
1239
+ dsl_id <- function (transform ) UseMethod(" dsl_id" )
1231
1240
1232
1241
dsl_id.transform <- function (transform ) {
1233
1242
if (! is.null(attr(transform , " id" ))) {
@@ -1240,7 +1249,7 @@ dsl_id.transform <- function(transform) {
1240
1249
all.vars(out , functions = FALSE ) %|| % TRUE
1241
1250
}
1242
1251
1243
- dsl_names <- function (... ) UseMethod(" dsl_names" )
1252
+ dsl_names <- function (transform ) UseMethod(" dsl_names" )
1244
1253
1245
1254
dsl_names.transform <- function (transform ) {
1246
1255
if (! is.null(attr(transform , " .names" ))) {
@@ -1249,25 +1258,25 @@ dsl_names.transform <- function(transform) {
1249
1258
eval(lang(transform )[[" .names" ]])
1250
1259
}
1251
1260
1252
- tag_in <- function (... ) UseMethod(" tag_in" )
1261
+ tag_in <- function (transform ) UseMethod(" tag_in" )
1253
1262
1254
1263
tag_in.transform <- function (transform ) {
1255
1264
attr(transform , " tag_in" ) %||| %
1256
1265
all.vars(lang(transform )[[" .tag_in" ]], functions = FALSE )
1257
1266
}
1258
1267
1259
- tag_out <- function (... ) UseMethod(" tag_out" )
1268
+ tag_out <- function (transform ) UseMethod(" tag_out" )
1260
1269
1261
1270
tag_out.transform <- function (transform ) {
1262
1271
attr(transform , " tag_out" ) %||| %
1263
1272
all.vars(lang(transform )[[" .tag_out" ]], functions = FALSE )
1264
1273
}
1265
1274
1266
- lang <- function (... ) UseMethod(" lang" )
1275
+ lang <- function (x ) UseMethod(" lang" )
1267
1276
1268
1277
lang.command <- lang.transform <- function (x ) x [[1 ]]
1269
1278
1270
- char <- function (... ) UseMethod(" char" )
1279
+ char <- function (x ) UseMethod(" char" )
1271
1280
1272
1281
char.transform <- function (x ) safe_deparse(lang(x ), backtick = TRUE )
1273
1282
0 commit comments