feat: change to keep .Last.value in parent environment

Author: averissimo

R/qenv-eval_code.R

@@ -63,13 +63,11 @@ setMethod("eval_code", signature = c(object = "qenv.error"), function(object, co
     x <- withCallingHandlers(
       tryCatch(
         {
-          .Last.value <- eval(current_call, envir = object@.xData)
-          attr(object@.xData, ".Last.value") <- .Last.value
-          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)
-            parent.env(object@.xData) <- parent.env(.GlobalEnv)
-          }
+          # needed to make sure that @.xData inherits from .GlobalEnv
+          # could be changed when any new package is added to search path (through library or require call)
+          new_parent <- new.env(parent = parent.env(.GlobalEnv))
+          new_parent[[".Last.value"]] <- eval(current_call, envir = object@.xData)
+          parent.env(object@.xData) <- new_parent
           NULL
         },
         error = function(e) {

man/within.qenv.Rd

@@ -189,7 +189,7 @@ testthat::test_that("comments passed alone to eval_code that contain @linksto ta
 
 testthat::test_that("eval_code keeps .Last.value as an attribute of the environment", {
   q <- eval_code(qenv(), quote(x <- 1))
-  env <- as.environment(q)
-  testthat::expect_true(".Last.value" %in% names(attributes(env)))
-  testthat::expect_equal(attr(env, ".Last.value"), 1)
+  env <- parent.env(q)
+  testthat::expect_true(".Last.value" %in% names(env))
+  testthat::expect_equal(env$.Last.value, 1)
 })

tests/testthat/test-qenv_eval_code.R

@@ -157,7 +157,7 @@ testthat::test_that("Code executed with integer shorthand (1L) is the same as or
 
 testthat::test_that("within keeps .Last.value as an attribute of the environment", {
   q <- within(qenv(), x <- 1)
-  env <- as.environment(q)
-  testthat::expect_true(".Last.value" %in% names(attributes(env)))
-  testthat::expect_equal(attr(env, ".Last.value"), 1)
+  env <- parent.env(q)
+  testthat::expect_true(".Last.value" %in% names(env))
+  testthat::expect_equal(env$.Last.value, 1)
 })