Skip to content
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

Jump to bottom

Refactor #935

Merged
merged 6 commits into from
Jul 31, 2021
Merged

Refactor #935

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d6a2e0
Explicit symbol assignment, with conversion to UTF-8
krlmlr Jul 31, 2021
9be66c0
Set names to j
krlmlr Jul 31, 2021
52ad45e
Clean up
krlmlr Jul 31, 2021
b3ab924
Adapt to rlang 0.4.11
krlmlr Jul 31, 2021
baa00a3
Merge branch 'master' into f-890-refactor-4
krlmlr Jul 31, 2021
49db392
Remove assertions
krlmlr Jul 31, 2021
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
28 changes: 19 additions & 9 deletions R/subsetting.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,10 @@ NULL
}

# Side effect: check scalar
if (!is.symbol(j)) {
if (is.symbol(j)) {
# FIXME: as_utf8_character() needs rlang > 0.4.11
j <- chr_unserialise_unicode(as.character(j))
} else {
if (!is.vector(j) || length(j) != 1L || is.na(j) || (is.numeric(j) && j < 0) || is.logical(j)) {
vectbl_as_col_location2(j, length(x), j_arg = j_arg, assign = TRUE)
}
Expand Down Expand Up @@ -417,11 +420,13 @@ tbl_subassign <- function(x, i, j, value, i_arg, j_arg, value_arg) {

if (is.null(j)) {
j <- seq_along(x)
names(j) <- names2(j)
} else if (!is.null(j_arg)) {
j <- vectbl_as_new_col_index(j, x, j_arg, names2(value), value_arg)
}

value <- vectbl_recycle_rhs(value, fast_nrow(x), length(j), i_arg = NULL, value_arg)

xo <- tbl_subassign_col(x, j, value)
} else if (is.null(i_arg)) {
# x[NULL, ...] <- value
Expand Down Expand Up @@ -488,27 +493,29 @@ vectbl_as_new_row_index <- function(i, x, i_arg) {
vectbl_as_new_col_index <- function(j, x, j_arg, names = "", value_arg = NULL) {
# Creates a named index vector
# Values: index
# Name: column name (for new columns)
# Name: column name (for all columns)

if (is_bare_character(j)) {
if (anyNA(j)) {
cnd_signal(error_assign_columns_non_na_only())
}

out <- match(j, names(x))
new <- which(is.na(out))
names <- j

j <- match(names, names(x))
new <- which(is.na(j))
if (has_length(new)) {
out[new] <- seq.int(length(x) + 1L, length.out = length(new))
j[new] <- seq.int(length(x) + 1L, length.out = length(new))
}
j <- set_names(out, j)
} else if (is_bare_numeric(j)) {
if (anyNA(j)) {
cnd_signal(error_assign_columns_non_na_only())
}

j <- numtbl_as_col_location_assign(j, length(x), j_arg = j_arg)

new <- which(j > length(x))
old <- (j <= length(x))
new <- which(!old)
j_new <- j[new]

if (length(names) != 1L) {
Expand All @@ -524,20 +531,23 @@ vectbl_as_new_col_index <- function(j, x, j_arg, names = "", value_arg = NULL) {
names[new][names[new] == ""] <- paste0("...", j_new)
}

j <- set_names(j, names)
names[old] <- names(x)[ j[old] ]
} else {
j <- vectbl_as_col_location(j, length(x), names(x), j_arg = j_arg, assign = TRUE)

if (anyNA(j)) {
cnd_signal(error_na_column_index(which(is.na(j))))
}

old <- (j <= length(x))
names[old] <- names(x)[ j[old] ]
}

if (anyDuplicated(j)) {
cnd_signal(error_duplicate_column_subscript_for_assignment(j))
}

j
set_names(j, names)
}

numtbl_as_row_location_assign <- function(i, n, i_arg) {
Expand Down