feat: qenv inherits from environment class

Author: averissimo

NAMESPACE

@@ -1,8 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method("[[",qenv.error)
-S3method(names,qenv)
-S3method(names,qenv.error)
 S3method(within,qenv)
 S3method(within,qenv.error)
 export(concat)

R/qenv-class.R

@@ -14,10 +14,19 @@
 #' @exportClass qenv
 setClass(
   "qenv",
-  slots = c(env = "environment", code = "character", id = "integer", warnings = "character", messages = "character"),
+  slots = c(
+    code = "character",
+    id = "integer",
+    warnings = "character",
+    messages = "character"
+  ),
+  contains = "environment",
   prototype = list(
-    env = new.env(parent = parent.env(.GlobalEnv)), code = character(0), id = integer(0),
-    warnings = character(0), messages = character(0)
+    .xData = new.env(parent = parent.env(.GlobalEnv)),
+    code = character(0),
+    id = integer(0),
+    warnings = character(0),
+    messages = character(0)
   )
 )
 

R/qenv-concat.R

@@ -38,8 +38,8 @@ setMethod("concat", signature = c("qenv", "qenv"), function(x, y) {
   y@messages <- c(x@messages, y@messages)
 
   # insert (and overwrite) objects from y to x
-  y@env <- rlang::env_clone(y@env, parent = parent.env(.GlobalEnv))
-  rlang::env_coalesce(env = y@env, from = x@env)
+  y@.xData <- rlang::env_clone(y@.xData, parent = parent.env(.GlobalEnv))
+  rlang::env_coalesce(env = y@.xData, from = x@.xData)
   y
 })
 

R/qenv-constructor.R

@@ -25,7 +25,7 @@
 qenv <- function() {
   q_env <- new.env(parent = parent.env(.GlobalEnv))
   lockEnvironment(q_env, bindings = TRUE)
-  methods::new("qenv", env = q_env)
+  methods::new("qenv", .xData = q_env)
 }
 
 
@@ -73,7 +73,11 @@ setMethod(
     id <- sample.int(.Machine$integer.max, size = length(code))
     methods::new(
       "qenv",
-      env = new_env, code = code, warnings = rep("", length(code)), messages = rep("", length(code)), id = id
+      .xData = new_env,
+      code = code,
+      warnings = rep("", length(code)),
+      messages = rep("", length(code)),
+      id = id
     )
   }
 )

R/qenv-eval_code.R

@@ -31,7 +31,7 @@ setMethod("eval_code", signature = c("qenv", "character"), function(object, code
   id <- sample.int(.Machine$integer.max, size = 1)
 
   object@id <- c(object@id, id)
-  object@env <- rlang::env_clone(object@env, parent = parent.env(.GlobalEnv))
+  object@.xData <- rlang::env_clone(object@.xData, parent = parent.env(.GlobalEnv))
   code <- paste(code, collapse = "\n")
   object@code <- c(object@code, code)
 
@@ -45,11 +45,11 @@ setMethod("eval_code", signature = c("qenv", "character"), function(object, code
     x <- withCallingHandlers(
       tryCatch(
         {
-          eval(single_call, envir = object@env)
-          if (!identical(parent.env(object@env), parent.env(.GlobalEnv))) {
+          eval(single_call, envir = object@.xData)
+          if (!identical(parent.env(object@.xData), parent.env(.GlobalEnv))) {
             # needed to make sure that @env 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@env) <- parent.env(.GlobalEnv)
+            parent.env(object@.xData) <- parent.env(.GlobalEnv)
           }
           NULL
         },
@@ -83,7 +83,7 @@ setMethod("eval_code", signature = c("qenv", "character"), function(object, code
   object@warnings <- c(object@warnings, current_warnings)
   object@messages <- c(object@messages, current_messages)
 
-  lockEnvironment(object@env, bindings = TRUE)
+  lockEnvironment(object@.xData, bindings = TRUE)
   object
 })
 

R/qenv-get_env.R

@@ -24,7 +24,7 @@ setGeneric("get_env", function(object) {
 })
 
 setMethod("get_env", "qenv", function(object) {
-  object@env
+  object@.xData
 })
 
 setMethod("get_env", "qenv.error", function(object) {

R/qenv-get_var.R

@@ -28,7 +28,7 @@ setGeneric("get_var", function(object, var) {
 
 setMethod("get_var", signature = c("qenv", "character"), function(object, var) {
   tryCatch(
-    get(var, envir = object@env, inherits = FALSE),
+    get(var, envir = object@.xData, inherits = FALSE),
     error = function(e) {
       message(conditionMessage(e))
       NULL

R/qenv-join.R

@@ -150,8 +150,8 @@ setMethod("join", signature = c("qenv", "qenv"), function(x, y) {
   x@messages <- c(x@messages, y@messages[id_unique])
 
   # insert (and overwrite) objects from y to x
-  x@env <- rlang::env_clone(x@env, parent = parent.env(.GlobalEnv))
-  rlang::env_coalesce(env = x@env, from = y@env)
+  x@.xData <- rlang::env_clone(x@.xData, parent = parent.env(.GlobalEnv))
+  rlang::env_coalesce(env = x@.xData, from = y@.xData)
   x
 })
 
@@ -175,9 +175,9 @@ setMethod("join", signature = c("qenv.error", "ANY"), function(x, y) {
   checkmate::assert_class(x, "qenv")
   checkmate::assert_class(y, "qenv")
 
-  common_names <- intersect(rlang::env_names(x@env), rlang::env_names(y@env))
+  common_names <- intersect(rlang::env_names(x@.xData), rlang::env_names(y@.xData))
   is_overwritten <- vapply(common_names, function(el) {
-    !identical(get(el, x@env), get(el, y@env))
+    !identical(get(el, x@.xData), get(el, y@.xData))
   }, logical(1))
   if (any(is_overwritten)) {
     return(

R/qenv-names.R

@@ -16,5 +16,5 @@
 #' @importFrom methods show
 #' @export
 setMethod("show", "qenv", function(object) {
-  rlang::env_print(object@env)
+  rlang::env_print(object@.xData)
 })