Merge pull request #78 from moodymudskipper/b-62-env-issue

fix environment issue
moodymudskipper · Jan 2, 2025 · f3b1470 · f3b1470
2 parents e5f143f + 2dc0e35
commit f3b1470
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/dep-suggests-matrix.json b/.github/dep-suggests-matrix.json
diff --git a/.github/versions-matrix.json b/.github/versions-matrix.json
diff --git a/R/02_declare.R b/R/02_declare.R
@@ -91,6 +91,7 @@ check_arg <- function(.arg, .assertion, ..., .bind = FALSE) {
 #' @export
 declare <- function(x, assertion, value, const = FALSE) {
   pf <- parent.frame()
+  f_env <- new.env(parent = pf)
 
   if(missing(assertion)) {
     assertion_quoted <- infer_implicit_assignment_call(value)
@@ -163,7 +164,7 @@ declare <- function(x, assertion, value, const = FALSE) {
             val
           }
         },
-        envir = pf),
+        envir = f_env),
       list(VAR_NM = x, VALUE = value)
     ))
   } else {
@@ -190,7 +191,7 @@ declare <- function(x, assertion, value, const = FALSE) {
             }
             val
           }
-        }, envir = pf),
+        }, envir = f_env),
         list (ASSERTION = assertion_quoted, VAR_NM = x, VALUE = value)
       )
     )

diff --git a/tests/testthat/test-declare.R b/tests/testthat/test-declare.R
@@ -39,3 +39,12 @@ test_that("declare works", {
   expect_equal(Double() ? x <- 1, 1)
   expect_error(Double() ? x <- 1L)
 })
+
+test_that("values are declared in separate environments", {
+  typed::Integer() ? a
+  typed::Integer() ? b
+
+  a <- 1L
+  b <- 2L
+  expect_equal(a, 1L)
+})