Skip to content

Commit 322ce59

Browse files
committed
tidying
1 parent 41e3fd0 commit 322ce59

3 files changed

Lines changed: 8 additions & 14 deletions

File tree

R/keylist.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ is.keylist <- function(x) inherits(x, c("klist", "knlist"))
8282
#' @rdname keylist
8383
#' @export
8484
as.keylist <- function(x, ...) {
85-
UseMethod("as.keylist", x)
85+
UseMethod("as.keylist")
8686
}
8787

8888
#' @rdname keylist

R/klist.r

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ as.klist <- function(x, ...) {
6767
#' @rdname klist
6868
#' @export
6969
as.klist.default <- function(x, ..., .recursive = FALSE) {
70-
x <- as.list(x)
70+
x <- as.list(x, ...)
7171
if (isTRUE(.recursive)) {
7272
.Call(validate_klist_list_c, x)
7373
} else {
@@ -110,22 +110,19 @@ print.klist <- function(x, ...) {
110110

111111
#' @export
112112
"[.klist" <- function(x, i, value) {
113-
x <- NextMethod()
114-
.Call(if_list_force_class, x, "klist")
113+
.Call(if_list_force_class, NextMethod(), "klist")
115114
}
116115

117116
# this will cause setNames to change too
118117

119118
#' @rdname klist
120119
#' @export
121120
"names<-.klist" <- function(x, value) {
122-
x <- NextMethod()
123-
.Call(validate_klist_node_c, x)
121+
.Call(validate_klist_node_c, NextMethod())
124122
}
125123

126124
#' @rdname klist
127125
#' @export
128126
c.klist <- function(...) {
129-
x <- NextMethod()
130-
.Call(validate_klist_node_c, as.list(x))
127+
.Call(validate_klist_node_c, NextMethod())
131128
}

R/knlist.r

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ stop_non_chr_assignment <- function(i) {
120120

121121
#' @export
122122
"[.knlist" <- function(x, i, value) {
123-
x <- NextMethod()
124-
.Call(if_list_force_class, x, "knlist")
123+
.Call(if_list_force_class, NextMethod(), "knlist")
125124
}
126125

127126
#' @export
@@ -144,13 +143,11 @@ stop_non_chr_assignment <- function(i) {
144143
if (is.null(value)) {
145144
stop("Names cannot be removed from a knlist object.")
146145
}
147-
x <- NextMethod()
148-
.Call(validate_knlist_node_c, x)
146+
.Call(validate_knlist_node_c, NextMethod())
149147
}
150148

151149
#' @rdname knlist
152150
#' @export
153151
c.knlist <- function(...) {
154-
x <- NextMethod()
155-
.Call(validate_knlist_node_c, as.list(x))
152+
.Call(validate_knlist_node_c, NextMethod())
156153
}

0 commit comments

Comments
 (0)