Fixed compatibility bug in glue version 1.8.0

tsahota · Jan 10, 2025 · 64387ba · 64387ba
1 parent f33faa4
commit 64387ba
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -3,7 +3,7 @@ Type: Package
 Title: Script Based 'NONMEM' Model Development
 URL: https://tsahota.github.io/NMproject/, https://github.com/tsahota/NMproject
 BugReports: https://github.com/tsahota/NMproject/issues
-Version: 0.6.9
+Version: 0.6.10
 Authors@R: c(
  person("Tarj", "Sahota", email = "[email protected]", 
     role = c("aut", "cre", "cph")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# NMproject 0.6.10
+
+* Fixed compatibility bug in glue version `1.8.0`
+
 # NMproject 0.6.9
 
 * Removed timing test

diff --git a/R/Vectorize.R b/R/Vectorize.R
@@ -68,7 +68,7 @@ Vectorize_nm_list <- function(FUN, vectorize.args = arg.names, SIMPLIFY = FALSE,
         m <- args[dovec][[1]][[i]] ## nm_generic
         if (is.character(replace_arg_value)) {
           args[dovec][[replace_arg]][i] <- stringr::str_glue(replace_arg_value,
-            .envir = m
+            .envir = as.environment(m)
           )
         }
       }

diff --git a/R/nm_object.R b/R/nm_object.R
@@ -545,7 +545,7 @@ glue_text_nm <- function(m, text) {
   UseMethod("glue_text_nm")
 }
 glue_text_nm.nm_generic <- function(m, text) {
-  stringr::str_glue(text, .envir = m, .na = NULL)
+  stringr::str_glue(text, .envir = as.environment(m), .na = NULL)
 }
 glue_text_nm.nm_list <- Vectorize_nm_list(glue_text_nm.nm_generic, SIMPLIFY = TRUE)
 
@@ -555,7 +555,7 @@ replace_tag <- function(m, field) {
   if (!is.na(m$glue_fields[[field]])) {
     ## start by resetting to raw
     m[[field]] <- glue_text_nm(m, m$glue_fields[[field]])
-    # m[[field]] <- stringr::str_glue(m$glue_fields[[field]], .envir = m)
+    # m[[field]] <- stringr::str_glue(m$glue_fields[[field]], .envir = as.environment(m))
     m[[field]] <- as.character(m[[field]])
   }
   m

diff --git a/R/nm_tran.R b/R/nm_tran.R
@@ -66,7 +66,7 @@ nm_tran.default <- function(x) {
   message("running NMTRAN on ", x)
 
   nm_tran_command <- nm_tran_command()
-  cmd <- stringr::str_glue(nm_tran_command, .envir = list(ctl_name = basename(x)), .na = NULL)
+  cmd <- stringr::str_glue(nm_tran_command, .envir = as.environment(list(ctl_name = basename(x))), .na = NULL)
   ## if non-glue - append the control file name
   if (cmd == nm_tran_command) cmd <- paste(cmd, "<", basename(x))