using lazyeval for mutate.

sharlagelfand · Sep 24, 2014 · 42d0bde · 42d0bde
1 parent 7c9abed
commit 42d0bde
Show file tree

Hide file tree

Showing 92 changed files with 165 additions and 153 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.0.2): do not edit by hand
+# Generated by roxygen2 (4.0.2.9000): do not edit by hand
 
 S3method("[",grouped_df)
 S3method("[",tbl_df)
@@ -146,12 +146,7 @@ S3method(left_join,data.frame)
 S3method(left_join,data.table)
 S3method(left_join,tbl_df)
 S3method(left_join,tbl_sql)
-S3method(mutate,data.frame)
-S3method(mutate,data.table)
-S3method(mutate,grouped_dt)
-S3method(mutate,tbl_df)
-S3method(mutate,tbl_dt)
-S3method(mutate,tbl_sql)
+S3method(mutate_,tbl_df)
 S3method(n_groups,data.frame)
 S3method(n_groups,grouped_df)
 S3method(n_groups,grouped_dt)
@@ -371,6 +366,12 @@ export(location)
 export(make_tbl)
 export(min_rank)
 export(mutate)
+export(mutate.data.frame)
+export(mutate.data.table)
+export(mutate.grouped_dt)
+export(mutate.tbl_dt)
+export(mutate.tbl_sql)
+export(mutate_)
 export(mutate_each)
 export(mutate_each_q)
 export(n)

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -123,8 +123,8 @@ slice_impl <- function(df, args, env) {
     .Call('dplyr_slice_impl', PACKAGE = 'dplyr', df, args, env)
 }
 
-mutate_impl <- function(df, args, env) {
-    .Call('dplyr_mutate_impl', PACKAGE = 'dplyr', df, args, env)
+mutate_impl <- function(df, dots) {
+    .Call('dplyr_mutate_impl', PACKAGE = 'dplyr', df, dots)
 }
 
 order_impl <- function(args, env) {

diff --git a/R/manip-df.r b/R/manip-df.r
@@ -17,7 +17,10 @@ filter.tbl_df    <- .data_dots(filter_impl)
 slice.tbl_df   <- .data_dots(slice_impl)
 
 #' @export
-mutate.tbl_df    <- .data_dots(mutate_impl, named_dots)
+mutate_.tbl_df  <- function(.data, ..., .dots) {
+  dots <- lazyeval::all_dots(.dots, ..., env = parent.frame(), all_named = TRUE)
+  mutate_impl(.data, dots)
+}
 
 #' @export
 summarise_.tbl_df <- function(.data, ..., .dots) {

diff --git a/R/manip.r b/R/manip.r
@@ -88,7 +88,15 @@ summarize_ <- summarise_
 #' transmute(mtcars, displ_l = disp / 61.0237)
 #'
 #' mutate(mtcars, cyl = NULL)
-mutate <- function(.data, ...) UseMethod("mutate")
+mutate <- function(.data, ...) {
+  mutate_(.data, .dots = lazyeval::lazy_dots(...))
+}
+
+#' @export
+#' @rdname mutate
+mutate_ <- function(.data, ..., .dots) {
+  UseMethod("mutate_")
+}
 
 #' @rdname mutate
 #' @export

diff --git a/R/tbl-data-frame.R b/R/tbl-data-frame.R
@@ -36,10 +36,9 @@ summarise_.data.frame <- function(.data, ..., .dots) {
   as.data.frame(summarise_(tbl_df(.data), .dots = dots))
 }
 #' @export
-mutate.data.frame <-  function(.data, ...) {
-  tbl <- tbl_df(.data)
-  res <- mutate.tbl_df(tbl, ...)
-  as.data.frame(res)
+mutate_.data.frame <-  function(.data, ..., .dots) {
+  dots <- lazyeval::all_dots(.dots, ..., env = parent.frame(), all_named = TRUE)
+  as.data.frame(mutate_(tbl_df(.data), .dots = dots))
 }
 #' @export
 arrange.data.frame <- function(.data, ...) {

diff --git a/man/all.equal.tbl_df.Rd b/man/all.equal.tbl_df.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{all.equal.tbl_df}
 \alias{all.equal.tbl_df}
 \alias{all.equal.tbl_dt}

diff --git a/man/arrange.Rd b/man/arrange.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{arrange}
 \alias{arrange}
 \title{Arrange rows by variables.}
@@ -34,10 +34,11 @@ arrange(mtcars, desc(disp))
 }
 \seealso{
 Other single.table.verbs: \code{\link{filter}};
-  \code{\link{mutate}}, \code{\link{transmute}};
-  \code{\link{rename}}, \code{\link{select}},
-  \code{\link{select_}}; \code{\link{slice}};
-  \code{\link{summarise}}, \code{\link{summarise_}},
-  \code{\link{summarize}}, \code{\link{summarize_}}
+  \code{\link{mutate}}, \code{\link{mutate_}},
+  \code{\link{transmute}}; \code{\link{rename}},
+  \code{\link{select}}, \code{\link{select_}};
+  \code{\link{slice}}; \code{\link{summarise}},
+  \code{\link{summarise_}}, \code{\link{summarize}},
+  \code{\link{summarize_}}
 }
 
diff --git a/man/as.tbl_cube.Rd b/man/as.tbl_cube.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{as.tbl_cube}
 \alias{as.tbl_cube}
 \alias{as.tbl_cube.array}

diff --git a/man/backend_db.Rd b/man/backend_db.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{backend_db}
 \alias{backend_db}
 \alias{db_analyze}

diff --git a/man/backend_sql.Rd b/man/backend_sql.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{backend_sql}
 \alias{backend_sql}
 \alias{sql_escape_ident}

diff --git a/man/backend_src.Rd b/man/backend_src.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{backend_src}
 \alias{backend_src}
 \alias{src_desc}

diff --git a/man/bench_compare.Rd b/man/bench_compare.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{bench_compare}
 \alias{bench_compare}
 \alias{bench_tbls}

diff --git a/man/between.Rd b/man/between.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{between}
 \alias{between}
 \title{Do values in a numeric vector fail in specified range?}

diff --git a/man/build_sql.Rd b/man/build_sql.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{build_sql}
 \alias{build_sql}
 \title{Build a SQL string.}

diff --git a/man/chain.Rd b/man/chain.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{chain}
 \alias{\%.\%}
 \alias{\%>\%}

diff --git a/man/compute.Rd b/man/compute.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{compute}
 \alias{collapse}
 \alias{collect}

diff --git a/man/copy_to.Rd b/man/copy_to.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{copy_to}
 \alias{copy_to}
 \title{Copy a local data frame to a remote src.}

diff --git a/man/copy_to.src_sql.Rd b/man/copy_to.src_sql.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{copy_to.src_sql}
 \alias{copy_to.src_sql}
 \title{Copy a local data fram to a sqlite src.}

diff --git a/man/cumall.Rd b/man/cumall.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{cumall}
 \alias{cumall}
 \alias{cumany}

diff --git a/man/data_frame.Rd b/man/data_frame.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{data_frame}
 \alias{data_frame}
 \alias{data_frame_}

diff --git a/man/desc.Rd b/man/desc.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{desc}
 \alias{desc}
 \title{Descending order.}

diff --git a/man/distinct.Rd b/man/distinct.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{distinct}
 \alias{distinct}
 \alias{distinct_}

diff --git a/man/do.Rd b/man/do.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{do}
 \alias{do}
 \alias{do.tbl_sql}

diff --git a/man/dplyr-cluster.Rd b/man/dplyr-cluster.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{dplyr-cluster}
 \alias{dplyr-cluster}
 \alias{get_cluster}

diff --git a/man/dplyr-formatting.Rd b/man/dplyr-formatting.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{print.tbl_df}
 \alias{dim_desc}
 \alias{dplyr-formatting}

diff --git a/man/dplyr.Rd b/man/dplyr.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \docType{package}
 \name{dplyr}
 \alias{dplyr}

diff --git a/man/explain.Rd b/man/explain.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{explain}
 \alias{explain}
 \alias{show_query}

diff --git a/man/failwith.Rd b/man/failwith.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{failwith}
 \alias{failwith}
 \title{Fail with specified value.}

diff --git a/man/filter.Rd b/man/filter.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{filter}
 \alias{filter}
 \title{Return rows with matching conditions.}
@@ -26,10 +26,11 @@ filter(mtcars, cyl < 6)
 }
 \seealso{
 Other single.table.verbs: \code{\link{arrange}};
-  \code{\link{mutate}}, \code{\link{transmute}};
-  \code{\link{rename}}, \code{\link{select}},
-  \code{\link{select_}}; \code{\link{slice}};
-  \code{\link{summarise}}, \code{\link{summarise_}},
-  \code{\link{summarize}}, \code{\link{summarize_}}
+  \code{\link{mutate}}, \code{\link{mutate_}},
+  \code{\link{transmute}}; \code{\link{rename}},
+  \code{\link{select}}, \code{\link{select_}};
+  \code{\link{slice}}; \code{\link{summarise}},
+  \code{\link{summarise_}}, \code{\link{summarize}},
+  \code{\link{summarize_}}
 }
 
diff --git a/man/funs.Rd b/man/funs.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{funs}
 \alias{funs}
 \alias{funs_q}

diff --git a/man/glimpse.Rd b/man/glimpse.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{glimpse}
 \alias{glimpse}
 \title{Get a glimpse of your data.}

diff --git a/man/group_by.Rd b/man/group_by.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{group_by}
 \alias{group_by}
 \title{Group a tbl by one or more variables.}

diff --git a/man/group_size.Rd b/man/group_size.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{group_size}
 \alias{group_size}
 \alias{n_groups}

diff --git a/man/grouped_df.Rd b/man/grouped_df.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{grouped_df}
 \alias{grouped_df}
 \alias{is.grouped_df}

diff --git a/man/grouped_dt.Rd b/man/grouped_dt.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{grouped_dt}
 \alias{grouped_dt}
 \alias{is.grouped_dt}

diff --git a/man/groups.Rd b/man/groups.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{groups}
 \alias{groups}
 \alias{regroup}

diff --git a/man/id.Rd b/man/id.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{id}
 \alias{id}
 \title{Compute a unique numeric id for each unique row in a data frame.}

diff --git a/man/join.Rd b/man/join.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{join}
 \alias{anti_join}
 \alias{inner_join}

diff --git a/man/join.tbl_df.Rd b/man/join.tbl_df.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{join.tbl_df}
 \alias{anti_join.tbl_df}
 \alias{inner_join.tbl_df}

diff --git a/man/join.tbl_dt.Rd b/man/join.tbl_dt.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{join.tbl_dt}
 \alias{anti_join.data.table}
 \alias{inner_join.data.table}

diff --git a/man/join.tbl_sql.Rd b/man/join.tbl_sql.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{join.tbl_sql}
 \alias{anti_join.tbl_sql}
 \alias{inner_join.tbl_sql}

diff --git a/man/lahman.Rd b/man/lahman.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{lahman}
 \alias{copy_lahman}
 \alias{has_lahman}

diff --git a/man/lead-lag.Rd b/man/lead-lag.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{lead-lag}
 \alias{lag.default}
 \alias{lead}

diff --git a/man/location.Rd b/man/location.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{location}
 \alias{changes}
 \alias{location}

diff --git a/man/make_tbl.Rd b/man/make_tbl.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{make_tbl}
 \alias{make_tbl}
 \title{Create a "tbl" object}

diff --git a/man/manip_dt.Rd b/man/manip_dt.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{manip_dt}
 \alias{arrange.data.table}
 \alias{filter.data.table}
@@ -13,7 +13,7 @@
 
 \method{summarise_}{data.table}(.data, ..., .dots)
 
-\method{mutate}{data.table}(.data, ..., inplace = FALSE)
+mutate.data.table(.data, ..., inplace = FALSE)
 
 \method{arrange}{data.table}(.data, ...)
 

diff --git a/man/manip_grouped_dt.Rd b/man/manip_grouped_dt.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.0.2.9000): do not edit by hand
 \name{manip_grouped_dt}
 \alias{arrange.grouped_dt}
 \alias{filter.grouped_dt}
@@ -13,7 +13,7 @@
 
 \method{summarise_}{grouped_dt}(.data, ..., .dots)
 
-\method{mutate}{grouped_dt}(.data, ..., inplace = FALSE)
+mutate.grouped_dt(.data, ..., inplace = FALSE)
 
 \method{arrange}{grouped_dt}(.data, ...)