Skip to content

Use is_unspecified() in vec_cast.list.default() #697

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

Merged
merged 3 commits into from
Jan 3, 2020
Merged

Use is_unspecified() in vec_cast.list.default() #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d027ef5
Use `is_unspecified()` in `vec_cast.list.default()`
DavisVaughan Dec 6, 2019
b675847
Replace `NA` values with `NULL` when casting to list
DavisVaughan Jan 2, 2020
b25174d
Ensure that data frames can be cast to shaped lists
DavisVaughan Jan 2, 2020
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
11 changes: 10 additions & 1 deletion R/type-bare.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,12 +413,14 @@ vec_cast.list.list <- function(x, to, ...) {
#' @export
#' @method vec_cast.list default
vec_cast.list.default <- function(x, to, ...) {
if (inherits(x, "vctrs_unspecified")) {
if (is_unspecified(x)) {
return(vec_init(to, length(x)))
}

out <- lapply(seq_along(x), function(i) x[[i]])

vec_slice(out, vec_equal_na(x)) <- list(NULL)

if (!is.object(to)) {
out <- shape_broadcast(out, to)
}
Expand All @@ -433,6 +435,13 @@ vec_cast.list.data.frame <- function(x, to, ...) {
# equivalent for `vec_get()`
row.names(x) <- NULL
out <- vec_chop(x)

vec_slice(out, vec_equal_na(x)) <- list(NULL)

if (!is.object(to)) {
out <- shape_broadcast(out, to)
}

out
}

Expand Down
24 changes: 23 additions & 1 deletion tests/testthat/test-type-bare.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ test_that("can sort raw", {

test_that("safe casts work as expected", {
expect_equal(vec_cast(NULL, list()), NULL)
expect_equal(vec_cast(NA, list()), list(NA))
expect_equal(vec_cast(NA, list()), list(NULL))
expect_equal(vec_cast(1:2, list()), list(1L, 2L))
expect_equal(vec_cast(list(1L, 2L), list()), list(1L, 2L))
})
Expand All @@ -320,6 +320,28 @@ test_that("data frames are cast to list row wise (#639)", {
expect_equal(vec_cast(x, list()), expect)
})

test_that("data frames can be cast to shaped lists", {
to <- array(list(), dim = c(0, 2, 1))
x <- data.frame(x = 1:2, y = 3:4)

expect <- list(vec_slice(x, 1), vec_slice(x, 2))
expect <- array(expect, dim = c(2, 2, 1))

expect_equal(vec_cast(x, to), expect)
})

test_that("Casting atomic `NA` values to list results in a `NULL`", {
x <- c(NA, 1)
expect <- list(NULL, 1)
expect_equal(vec_cast(x, list()), expect)
})

test_that("Casting data frame `NA` rows to list results in a `NULL`", {
x <- data.frame(x = c(NA, NA, 1), y = c(NA, 1, 2))
expect <- list(NULL, vec_slice(x, 2), vec_slice(x, 3))
expect_equal(vec_cast(x, list()), expect)
})

# Unspecified

test_that("unspecified can be cast to bare methods", {
Expand Down