From c89f02823035ec9015c75eb0078fd939e99eb9e0 Mon Sep 17 00:00:00 2001 From: wlandau Date: Tue, 30 Jan 2018 01:18:14 -0500 Subject: [PATCH] Replace quote() with rlang::expr() in run.R Begins to address #200. Tries to support the !! operator and quosures. --- DESCRIPTION | 1 + NAMESPACE | 1 + R/package.R | 1 + R/run.R | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index bc1dcf4db..d5a1d2240 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -59,6 +59,7 @@ Imports: parallel, plyr, R.utils, + rlang, rprojroot, stats, storr (>= 1.1.0), diff --git a/NAMESPACE b/NAMESPACE index b6e782307..1666c2f75 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -162,6 +162,7 @@ importFrom(parallel,parLapply) importFrom(parallel,stopCluster) importFrom(plyr,ddply) importFrom(plyr,dlply) +importFrom(rlang,expr) importFrom(rprojroot,find_root) importFrom(stats,coef) importFrom(stats,complete.cases) diff --git a/R/package.R b/R/package.R index 60750fe34..58c1a1c7b 100644 --- a/R/package.R +++ b/R/package.R @@ -54,6 +54,7 @@ #' mclapply parLapply stopCluster #' @importFrom plyr ddply dlply #' @importFrom R.utils isPackageLoaded withTimeout +#' @importFrom rlang expr #' @importFrom rprojroot find_root #' @importFrom stats coef complete.cases lm rnorm rpois runif setNames #' @importFrom storr encode64 storr_environment storr_rds diff --git a/R/run.R b/R/run.R index c0a682c38..353b7eab3 100644 --- a/R/run.R +++ b/R/run.R @@ -98,7 +98,7 @@ give_up <- function(target, config){ wrap_in_try_statement <- function(target, command){ paste( target, - "<- evaluate::try_capture_stack(quote({\n", + "<- evaluate::try_capture_stack(rlang::expr({\n", command, "\n}), env = config$envir)" )