Skip to content

Commit

Permalink
remove space after bang-bang
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Mar 13, 2018
1 parent ff511af commit f74931d
Show file tree
Hide file tree
Showing 37 changed files with 150 additions and 150 deletions.
2 changes: 1 addition & 1 deletion R/bind.r
Expand Up @@ -72,7 +72,7 @@
#' bind_rows(ll)
#'
#' # You can circumvent that behaviour with explicit splicing:
#' bind_rows(!!! ll)
#' bind_rows(!!!ll)
#'
#'
#' # When you supply a column name with the `.id` argument, a new
Expand Down
2 changes: 1 addition & 1 deletion R/case_when.R
Expand Up @@ -79,7 +79,7 @@
#' x %% 7 == 0 ~ "buzz",
#' TRUE ~ as.character(x)
#' )
#' case_when(!!! patterns)
#' case_when(!!!patterns)
case_when <- function(...) {
formulas <- list2(...)
n <- length(formulas)
Expand Down
2 changes: 1 addition & 1 deletion R/coalesce.R
Expand Up @@ -27,7 +27,7 @@
#' c(1, 2, NA, NA, 5),
#' c(NA, NA, 3, 4, 5)
#' )
#' coalesce(!!! vecs)
#' coalesce(!!!vecs)
coalesce <- function(...) {
if (missing(..1)) {
abort("At least one argument must be supplied")
Expand Down
6 changes: 3 additions & 3 deletions R/colwise-arrange.R
Expand Up @@ -21,7 +21,7 @@ arrange_all <- function(.tbl, .funs = list(), ...) {
if (!length(funs)) {
funs <- syms(tbl_vars(.tbl))
}
arrange(.tbl, !!! funs)
arrange(.tbl, !!!funs)
}
#' @rdname arrange_all
#' @export
Expand All @@ -30,7 +30,7 @@ arrange_at <- function(.tbl, .vars, .funs = list(), ...) {
if (!length(funs)) {
funs <- tbl_at_syms(.tbl, .vars)
}
arrange(.tbl, !!! funs)
arrange(.tbl, !!!funs)
}
#' @rdname arrange_all
#' @export
Expand All @@ -39,5 +39,5 @@ arrange_if <- function(.tbl, .predicate, .funs = list(), ...) {
if (!length(funs)) {
funs <- tbl_if_syms(.tbl, .predicate)
}
arrange(.tbl, !!! funs)
arrange(.tbl, !!!funs)
}
8 changes: 4 additions & 4 deletions R/colwise-filter.R
Expand Up @@ -34,21 +34,21 @@
filter_all <- function(.tbl, .vars_predicate) {
syms <- syms(tbl_nongroup_vars(.tbl))
pred <- apply_filter_syms(.vars_predicate, syms, .tbl)
filter(.tbl, !! pred)
filter(.tbl, !!pred)
}
#' @rdname filter_all
#' @export
filter_if <- function(.tbl, .predicate, .vars_predicate) {
syms <- tbl_if_syms(.tbl, .predicate)
pred <- apply_filter_syms(.vars_predicate, syms, .tbl)
filter(.tbl, !! pred)
filter(.tbl, !!pred)
}
#' @rdname filter_all
#' @export
filter_at <- function(.tbl, .vars, .vars_predicate) {
syms <- tbl_at_syms(.tbl, .vars)
pred <- apply_filter_syms(.vars_predicate, syms, .tbl)
filter(.tbl, !! pred)
filter(.tbl, !!pred)
}

apply_filter_syms <- function(pred, syms, tbl) {
Expand All @@ -69,7 +69,7 @@ apply_filter_syms <- function(pred, syms, tbl) {
pred <- map(syms, function(sym) expr_substitute(pred, quote(.), sym))

if (length(pred)) {
joiner(!!! pred)
joiner(!!!pred)
} else {
pred
}
Expand Down
6 changes: 3 additions & 3 deletions R/colwise-group-by.R
Expand Up @@ -26,7 +26,7 @@ group_by_all <- function(.tbl, .funs = list(), ...) {
if (!length(funs)) {
funs <- syms(tbl_vars(.tbl))
}
group_by(.tbl, !!! funs)
group_by(.tbl, !!!funs)
}
#' @rdname group_by_all
#' @export
Expand All @@ -35,7 +35,7 @@ group_by_at <- function(.tbl, .vars, .funs = list(), ..., .add = FALSE) {
if (!length(funs)) {
funs <- tbl_at_syms(.tbl, .vars)
}
group_by(.tbl, !!! funs, add = .add)
group_by(.tbl, !!!funs, add = .add)
}
#' @rdname group_by_all
#' @export
Expand All @@ -44,5 +44,5 @@ group_by_if <- function(.tbl, .predicate, .funs = list(), ..., .add = FALSE) {
if (!length(funs)) {
funs <- tbl_if_syms(.tbl, .predicate)
}
group_by(.tbl, !!! funs, add = .add)
group_by(.tbl, !!!funs, add = .add)
}
26 changes: 13 additions & 13 deletions R/colwise-mutate.R
Expand Up @@ -70,20 +70,20 @@
#' by_species %>% summarise_all(c("min", "max"))
summarise_all <- function(.tbl, .funs, ...) {
funs <- manip_all(.tbl, .funs, enquo(.funs), caller_env(), ...)
summarise(.tbl, !!! funs)
summarise(.tbl, !!!funs)
}
#' @rdname summarise_all
#' @export
summarise_if <- function(.tbl, .predicate, .funs, ...) {
funs <- manip_if(.tbl, .predicate, .funs, enquo(.funs), caller_env(), ...)
summarise(.tbl, !!! funs)
summarise(.tbl, !!!funs)
}
#' @rdname summarise_all
#' @export
summarise_at <- function(.tbl, .vars, .funs, ..., .cols = NULL) {
.vars <- check_dot_cols(.vars, .cols)
funs <- manip_at(.tbl, .vars, .funs, enquo(.funs), caller_env(), ...)
summarise(.tbl, !!! funs)
summarise(.tbl, !!!funs)
}

#' @rdname summarise_all
Expand All @@ -100,40 +100,40 @@ summarize_at <- summarise_at
#' @export
mutate_all <- function(.tbl, .funs, ...) {
funs <- manip_all(.tbl, .funs, enquo(.funs), caller_env(), ...)
mutate(.tbl, !!! funs)
mutate(.tbl, !!!funs)
}
#' @rdname summarise_all
#' @export
mutate_if <- function(.tbl, .predicate, .funs, ...) {
funs <- manip_if(.tbl, .predicate, .funs, enquo(.funs), caller_env(), ...)
mutate(.tbl, !!! funs)
mutate(.tbl, !!!funs)
}
#' @rdname summarise_all
#' @export
mutate_at <- function(.tbl, .vars, .funs, ..., .cols = NULL) {
.vars <- check_dot_cols(.vars, .cols)
funs <- manip_at(.tbl, .vars, .funs, enquo(.funs), caller_env(), ...)
mutate(.tbl, !!! funs)
mutate(.tbl, !!!funs)
}

#' @rdname summarise_all
#' @export
transmute_all <- function(.tbl, .funs, ...) {
funs <- manip_all(.tbl, .funs, enquo(.funs), caller_env(), ...)
transmute(.tbl, !!! funs)
transmute(.tbl, !!!funs)
}
#' @rdname summarise_all
#' @export
transmute_if <- function(.tbl, .predicate, .funs, ...) {
funs <- manip_if(.tbl, .predicate, .funs, enquo(.funs), caller_env(), ...)
transmute(.tbl, !!! funs)
transmute(.tbl, !!!funs)
}
#' @rdname summarise_all
#' @export
transmute_at <- function(.tbl, .vars, .funs, ..., .cols = NULL) {
.vars <- check_dot_cols(.vars, .cols)
funs <- manip_at(.tbl, .vars, .funs, enquo(.funs), caller_env(), ...)
transmute(.tbl, !!! funs)
transmute(.tbl, !!!funs)
}

# Helpers -----------------------------------------------------------------
Expand Down Expand Up @@ -231,14 +231,14 @@ summarise_each_ <- function(tbl, funs, vars) {
} else {
inform(glue(msg, "\nTo map `funs` over a selection of variables, use `summarise_at()`"))
vars <- compat_lazy_dots(vars, caller_env())
vars <- tidyselect::vars_select(tbl_nongroup_vars(tbl), !!! vars)
vars <- tidyselect::vars_select(tbl_nongroup_vars(tbl), !!!vars)
}
if (is_character(funs)) {
funs <- funs_(funs)
}

funs <- manip_apply_syms(funs, syms(vars), tbl)
summarise(tbl, !!! funs)
summarise(tbl, !!!funs)
}

#' @export
Expand All @@ -263,10 +263,10 @@ mutate_each_ <- function(tbl, funs, vars) {
} else {
inform(glue(msg, "\nTo map `funs` over a selection of variables, use `mutate_at()`"))
vars <- compat_lazy_dots(vars, caller_env())
vars <- tidyselect::vars_select(tbl_nongroup_vars(tbl), !!! vars)
vars <- tidyselect::vars_select(tbl_nongroup_vars(tbl), !!!vars)
}
funs <- manip_apply_syms(funs, syms(vars), tbl)
mutate(tbl, !!! funs)
mutate(tbl, !!!funs)
}

#' @rdname summarise_each
Expand Down
12 changes: 6 additions & 6 deletions R/colwise-select.R
Expand Up @@ -38,15 +38,15 @@ select_all <- function(.tbl, .funs = list(), ...) {
funs <- as_fun_list(.funs, enquo(.funs), caller_env(), ...)
vars <- tbl_nongroup_vars(.tbl)
syms <- vars_select_syms(vars, funs, .tbl)
select(.tbl, !!! syms)
select(.tbl, !!!syms)
}
#' @rdname select_all
#' @export
rename_all <- function(.tbl, .funs = list(), ...) {
funs <- as_fun_list(.funs, enquo(.funs), caller_env(), ...)
vars <- tbl_nongroup_vars(.tbl)
syms <- vars_select_syms(vars, funs, .tbl, strict = TRUE)
rename(.tbl, !!! syms)
rename(.tbl, !!!syms)
}

#' @rdname select_all
Expand All @@ -55,15 +55,15 @@ select_if <- function(.tbl, .predicate, .funs = list(), ...) {
funs <- as_fun_list(.funs, enquo(.funs), caller_env(), ...)
vars <- tbl_if_vars(.tbl, .predicate, caller_env())
syms <- vars_select_syms(vars, funs, .tbl)
select(.tbl, !!! syms)
select(.tbl, !!!syms)
}
#' @rdname select_all
#' @export
rename_if <- function(.tbl, .predicate, .funs = list(), ...) {
funs <- as_fun_list(.funs, enquo(.funs), caller_env(), ...)
vars <- tbl_if_vars(.tbl, .predicate, caller_env())
syms <- vars_select_syms(vars, funs, .tbl, strict = TRUE)
rename(.tbl, !!! syms)
rename(.tbl, !!!syms)
}

#' @rdname select_all
Expand All @@ -72,15 +72,15 @@ select_at <- function(.tbl, .vars, .funs = list(), ...) {
vars <- tbl_at_vars(.tbl, .vars)
funs <- as_fun_list(.funs, enquo(.funs), caller_env(), ...)
syms <- vars_select_syms(vars, funs, .tbl)
select(.tbl, !!! syms)
select(.tbl, !!!syms)
}
#' @rdname select_all
#' @export
rename_at <- function(.tbl, .vars, .funs = list(), ...) {
vars <- tbl_at_vars(.tbl, .vars)
funs <- as_fun_list(.funs, enquo(.funs), caller_env(), ...)
syms <- vars_select_syms(vars, funs, .tbl, strict = TRUE)
rename(.tbl, !!! syms)
rename(.tbl, !!!syms)
}

vars_select_syms <- function(vars, funs, tbl, strict = FALSE) {
Expand Down
2 changes: 1 addition & 1 deletion R/colwise.R
Expand Up @@ -127,7 +127,7 @@ tbl_at_vars <- function(tbl, vars) {
} else if (is_integerish(vars)) {
tibble_vars[vars]
} else if (is_quosures(vars)) {
out <- tidyselect::vars_select(tibble_vars, !!! vars)
out <- tidyselect::vars_select(tibble_vars, !!!vars)
if (!any(have_name(vars))) {
names(out) <- NULL
}
Expand Down
4 changes: 2 additions & 2 deletions R/compat-dbplyr.R
Expand Up @@ -35,8 +35,8 @@ wrap_dbplyr_obj <- function(obj_name) {
args <- formals()
pass_on <- map(set_names(names(args)), sym)

dbplyr_call <- expr((!!dbplyr_sym)(!!! pass_on))
dplyr_call <- expr((!!dplyr_sym)(!!! pass_on))
dbplyr_call <- expr((!!dbplyr_sym)(!!!pass_on))
dplyr_call <- expr((!!dplyr_sym)(!!!pass_on))
} else {
args <- list()

Expand Down
26 changes: 13 additions & 13 deletions R/count-tally.R
Expand Up @@ -71,14 +71,14 @@ tally <- function(x, wt, sort = FALSE) {
if (quo_is_missing(wt) || quo_is_null(wt)) {
n <- quo(n())
} else {
n <- quo(sum(!! wt, na.rm = TRUE))
n <- quo(sum(!!wt, na.rm = TRUE))
}

n_name <- n_name(tbl_vars(x))
out <- summarise(x, !! n_name := !! n)
out <- summarise(x, !!n_name := !!n)

if (sort) {
arrange(out, desc(!! sym(n_name)))
arrange(out, desc(!!sym(n_name)))
} else {
out
}
Expand All @@ -88,7 +88,7 @@ tally <- function(x, wt, sort = FALSE) {
#' @export
tally_ <- function(x, wt, sort = FALSE) {
wt <- compat_lazy(wt, caller_env())
tally(x, wt = !! wt, sort = sort)
tally(x, wt = !!wt, sort = sort)
}

n_name <- function(x) {
Expand All @@ -107,8 +107,8 @@ count <- function(x, ..., wt = NULL, sort = FALSE) {
groups <- group_vars(x)

x <- group_by(x, ..., add = TRUE)
x <- tally(x, wt = !! enquo(wt), sort = sort)
x <- group_by(x, !!! syms(groups), add = FALSE)
x <- tally(x, wt = !!enquo(wt), sort = sort)
x <- group_by(x, !!!syms(groups), add = FALSE)
x
}
#' @export
Expand All @@ -117,7 +117,7 @@ count_ <- function(x, vars, wt = NULL, sort = FALSE) {
vars <- compat_lazy_dots(vars, caller_env())
wt <- wt %||% quo(NULL)
wt <- compat_lazy(wt, caller_env())
count(x, !!! vars, wt = !! wt, sort = sort)
count(x, !!!vars, wt = !!wt, sort = sort)
}

#' @rdname tally
Expand All @@ -133,14 +133,14 @@ add_tally <- function(x, wt, sort = FALSE) {
if (quo_is_missing(wt) || quo_is_null(wt)) {
n <- quo(n())
} else {
n <- quo(sum(!! wt, na.rm = TRUE))
n <- quo(sum(!!wt, na.rm = TRUE))
}

n_name <- n_name(tbl_vars(x))
out <- mutate(x, !! n_name := !! n)
out <- mutate(x, !!n_name := !!n)

if (sort) {
out <- arrange(out, desc(!! sym(n_name)))
out <- arrange(out, desc(!!sym(n_name)))
}

grouped_df(out, group_vars(x))
Expand All @@ -149,7 +149,7 @@ add_tally <- function(x, wt, sort = FALSE) {
#' @export
add_tally_ <- function(x, wt, sort = FALSE) {
wt <- compat_lazy(wt, caller_env())
add_tally(x, !! wt, sort = sort)
add_tally(x, !!wt, sort = sort)
}


Expand All @@ -159,7 +159,7 @@ add_count <- function(x, ..., wt = NULL, sort = FALSE) {
g <- group_vars(x)
grouped <- group_by(x, ..., add = TRUE)

out <- add_tally(grouped, wt = !! enquo(wt), sort = sort)
out <- add_tally(grouped, wt = !!enquo(wt), sort = sort)
grouped_df(out, g)
}
#' @rdname se-deprecated
Expand All @@ -168,5 +168,5 @@ add_count_ <- function(x, vars, wt = NULL, sort = FALSE) {
vars <- compat_lazy_dots(vars, caller_env())
wt <- wt %||% quo(NULL)
wt <- compat_lazy(wt, caller_env())
add_count(x, !!! vars, wt = !! wt, sort = sort)
add_count(x, !!!vars, wt = !!wt, sort = sort)
}

0 comments on commit f74931d

Please sign in to comment.