cleanup: remove keep_output

Author: averissimo

R/qenv-eval_code.R

@@ -9,8 +9,6 @@
 #' @param code (`character`, `language` or `expression`) code to evaluate.
 #' It is possible to preserve original formatting of the `code` by providing a `character` or an
 #' `expression` being a result of `parse(keep.source = TRUE)`.
-#' @param keep_output (`logical(1)`) whether to keep the output of the code evaluation.
-#'
 #' @param ... ([`dots`]) additional arguments passed to future methods.
 #'
 #' @return
@@ -28,21 +26,21 @@
 #' @aliases eval_code,qenv.error-method
 #'
 #' @export
-setGeneric("eval_code", function(object, code, keep_output = FALSE, ...) standardGeneric("eval_code"))
+setGeneric("eval_code", function(object, code, ...) standardGeneric("eval_code"))
 
-setMethod("eval_code", signature = c(object = "qenv"), function(object, code, keep_output = FALSE, ...) {
+setMethod("eval_code", signature = c(object = "qenv"), function(object, code, ...) {
   if (!is.language(code) && !is.character(code)) {
     stop("eval_code accepts code being language or character")
   }
   code <- .preprocess_code(code)
   # preprocess code to ensure it is a character vector
-  .eval_code(object = object, code = code, keep_output = keep_output, ...)
+  .eval_code(object = object, code = code, ...)
 })
 
-setMethod("eval_code", signature = c(object = "qenv.error"), function(object, code, keep_output = FALSE, ...) object)
+setMethod("eval_code", signature = c(object = "qenv.error"), function(object, code, ...) object)
 
 #' @keywords internal
-.eval_code <- function(object, code, keep_output = FALSE, ...) {
+.eval_code <- function(object, code, ...) {
   if (identical(code, "")) {
     return(object)
   }
@@ -63,10 +61,7 @@ setMethod("eval_code", signature = c(object = "qenv.error"), function(object, co
     x <- withCallingHandlers(
       tryCatch(
         {
-          out <- eval(current_call, envir = object@.xData)
-          if (keep_output && i == length(code_split)) {
-            attr(current_code, "output") <- out
-          }
+          eval(current_call, envir = object@.xData)
           if (!identical(parent.env(object@.xData), parent.env(.GlobalEnv))) {
             # needed to make sure that @.xData is always a sibling of .GlobalEnv
             # could be changed when any new package is added to search path (through library or require call)

R/qenv-within.R

@@ -9,7 +9,6 @@
 #'
 #' @param data (`qenv`)
 #' @param expr (`expression`) to evaluate. Must be inline code, see `Using language objects...`
-#' @param keep_output (`logical(1)`) whether to keep the output of the code evaluation.
 #' @param ... named argument value will substitute a symbol in the `expr` matched by the name.
 #' For practical usage see Examples section below.
 #'
@@ -48,22 +47,22 @@
 #'
 #' @export
 #'
-within.qenv <- function(data, expr, keep_output = FALSE, ...) {
+within.qenv <- function(data, expr, ...) {
   expr <- as.expression(substitute(expr))
   extras <- list(...)
 
   # Inject extra values into expressions.
   calls <- lapply(expr, function(x) do.call(substitute, list(x, env = extras)))
   do.call(
     eval_code,
-    utils::modifyList(extras, list(object = data, code = as.expression(calls), keep_output = keep_output))
+    utils::modifyList(extras, list(object = data, code = as.expression(calls)))
   )
 }
 
 
 #' @keywords internal
 #'
 #' @export
-within.qenv.error <- function(data, expr, keep_output = FALSE, ...) {
+within.qenv.error <- function(data, expr, ...) {
   data
 }

man/eval_code.Rd

@@ -186,10 +186,3 @@ testthat::test_that("comments passed alone to eval_code that contain @linksto ta
     "x"
   )
 })
-
-testthat::test_that("keep_output stores the last output of the `code` evaluation in its 'output' attribute", {
-  q <- eval_code(qenv(), "a <- 1L;b <-2L;c<- 3L", keep_output = TRUE)
-  testthat::expect_identical(attr(q@code[[1]], "output"), NULL)
-  testthat::expect_identical(attr(q@code[[2]], "output"), NULL)
-  testthat::expect_identical(attr(q@code[[3]], "output"), 3L)
-})

tests/testthat/test-qenv_eval_code.R

@@ -154,17 +154,3 @@ testthat::test_that("Code executed with integer shorthand (1L) is the same as or
   q <- within(qenv(), a <- 1L)
   testthat::expect_identical(get_code(q), "a <- 1L")
 })
-
-testthat::test_that("keep_output stores the last output of the `code` evaluation in its 'output' attribute", {
-  q <- within(qenv(),
-    {
-      a <- 1L
-      b <- 2L
-      c <- 3L
-    },
-    keep_output = TRUE
-  )
-  testthat::expect_identical(attr(q@code[[1]], "output"), NULL)
-  testthat::expect_identical(attr(q@code[[2]], "output"), NULL)
-  testthat::expect_identical(attr(q@code[[3]], "output"), 3L)
-})