Fix shadowing of rm in global context.

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.2.3.9003
+
+* Fix broken usage of `rm` in global context.
+
 # Version 0.2.3.9002
 
 * Implement an `exists` method for `tracked_environment` objects.

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: objectdiff
 Type: Package
 Title: Objectdiff
-Version: 0.2.3.9002
+Version: 0.2.3.9003
 Description: Objectdiff is an R package for measuring differences
     between arbitrary R objects using patches, a la Git. For example,
     if you have slightly modified a data.frame, and you would like to

R/tracked_environment.R

@@ -73,8 +73,11 @@ ls.default <- function(...) {
 
 #' @export
 rm <- function(..., envir = as.environment(-1)) {
-  base::rm(..., envir =
-    if (is.tracked_environment(envir)) environment(envir) else envir)
+  if (is.tracked_environment(envir)) {
+    eval.parent(substitute(base::rm(..., envir = base::get("env", envir))))
+  } else {
+    eval.parent(substitute(base::rm(..., envir = envir)))
+  }
 }
 
 #' @export

tests/testthat/test-primitives.R

@@ -23,6 +23,12 @@ test_that('it does not break the rm function', {
   expect_false('x' %in% ls())
 })
 
+test_that('it does not break the rm function II', {
+  x <- 1
+  rm('x')
+  expect_false('x' %in% ls())
+})
+
 test_that('it does not break parent.env', {
   x <- new.env()
   y <- new.env(parent = x)