@llrs-roche review

Author: gogonzo

R/qenv-eval_code.R

@@ -100,13 +100,7 @@ setMethod("eval_code", signature = c("qenv", "expression"), function(object, cod
   if (length(srcref)) {
     eval_code(object, code = paste(attr(code, "wholeSrcref"), collapse = "\n"))
   } else {
-    eval_code(
-      object,
-      code = paste(
-        collapse = "\n",
-        vapply(lang2calls(code), deparse1, collapse = "\n", character(1L))
-      )
-    )
+    Reduce(function(x, code) eval_code(x, code), x = code, init = object)
   }
 })
 

tests/testthat/test-qenv_eval_code.R

@@ -1,8 +1,8 @@
 testthat::test_that("eval_code evaluates the code in the qenvs environment", {
   q <- qenv()
-  q1 <- eval_code(q, quote(iris1 <- iris))
-  q2 <- eval_code(q1, quote(b <- nrow(iris1)))
-  testthat::expect_identical(q2$b, 150L)
+  q1 <- eval_code(q, quote(a <- 1L))
+  q2 <- eval_code(q1, quote(b <- 1))
+  testthat::expect_equal(q2@.xData, list2env(list(a = 1L, b = 1)))
 })
 
 testthat::test_that("eval_code locks the environment", {
@@ -40,10 +40,9 @@ testthat::test_that("eval_code works with character", {
 })
 
 testthat::test_that("eval_code works with expression", {
-  q1 <- eval_code(qenv(), as.expression(quote(a <- 1)))
-
-  testthat::expect_identical(get_code(q1), "a <- 1")
-  testthat::expect_equal(q1@.xData, list2env(list(a = 1)))
+  q1 <- eval_code(qenv(), expression(a <- 1, b <- 2))
+  testthat::expect_identical(get_code(q1), "a <- 1\nb <- 2")
+  testthat::expect_equal(q1@.xData, list2env(list(a = 1, b = 2)))
 })
 
 testthat::test_that("eval_code works with quoted", {

tests/testthat/test-qenv_within.R

@@ -64,10 +64,17 @@ testthat::test_that("styling of input code does not impact evaluation results",
 
 
 # return value ----
-testthat::test_that("within.qenv renturns a `qenv` where `@.xData` is a deep copy of that in `data`", {
+testthat::test_that("within.qenv empty call doesn't change qenv object", {
   q <- qenv()
   q <- within(qenv(), i <- iris)
   qq <- within(q, {})
+  testthat::expect_identical(q, qq)
+})
+
+testthat::test_that("within.qenv renturns a `qenv` where `@.xData` is a deep copy of that in `data`", {
+  q <- qenv()
+  q <- within(qenv(), i <- iris)
+  qq <- within(q, i)
   testthat::expect_equal(q@.xData, qq@.xData)
   testthat::expect_false(identical(q@.xData, qq@.xData))
 })