From 567b4eb00dc5eb6d967e1fee95d7cd865f8ec7a3 Mon Sep 17 00:00:00 2001
From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:25:56 +0100
Subject: [PATCH] Safer naming of internal mirai elements

---
 R/daemon.R |  4 ++--
 R/mirai.R  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/R/daemon.R b/R/daemon.R
index 85d6e87c1..b0e145c28 100644
--- a/R/daemon.R
+++ b/R/daemon.R
@@ -202,8 +202,8 @@ eval_mirai <- function(._mirai_.) {
   withRestarts(
     withCallingHandlers(
       {
-        list2env(._mirai_.[["._mirai_globals_."]], envir = .GlobalEnv)
-        eval(._mirai_.[[".expr"]], envir = ._mirai_., enclos = .GlobalEnv)
+        list2env(._mirai_.[["._globals_."]], envir = .GlobalEnv)
+        eval(._mirai_.[["._expr_."]], envir = ._mirai_., enclos = .GlobalEnv)
       },
       error = handle_mirai_error,
       interrupt = handle_mirai_interrupt
diff --git a/R/mirai.R b/R/mirai.R
index 1330159ba..729560a3c 100644
--- a/R/mirai.R
+++ b/R/mirai.R
@@ -157,12 +157,12 @@ mirai <- function(.expr, ..., .args = list(), .timeout = NULL, .compute = NULL)
     globals[[".Random.seed"]] <- next_stream(envir)
   }
   data <- list(
-    ._mirai_globals_. = globals,
-    .expr = if (
+    ._expr_. = if (
       is.symbol(expr) &&
       exists(as.character(expr), envir = parent.frame()) &&
       is.language(.expr)
-    ) .expr else expr
+    ) .expr else expr,
+    ._globals_. = globals
   )
   if (length(.args)) {
     if (is.environment(.args)) {
@@ -614,14 +614,14 @@ mk_mirai_error <- function(cnd, sc) {
   cnd[["call"]] <- `attributes<-`(.subset2(cnd, "call"), NULL)
   call <- deparse_safe(.subset2(cnd, "call"))
   msg <- if (
-    is.null(call) || call == "eval(._mirai_.[[\".expr\"]], envir = ._mirai_., enclos = .GlobalEnv)"
+    is.null(call) || call == "eval(._mirai_.[[\"._expr_.\"]], envir = ._mirai_., enclos = .GlobalEnv)"
   ) {
     sprintf("Error: %s", .subset2(cnd, "message"))
   } else {
     sprintf("Error in %s: %s", call, .subset2(cnd, "message"))
   }
   idx <- max(which(as.logical(lapply(
-    sc, `==`, "eval(._mirai_.[[\".expr\"]], envir = ._mirai_., enclos = .GlobalEnv)"
+    sc, `==`, "eval(._mirai_.[[\"._expr_.\"]], envir = ._mirai_., enclos = .GlobalEnv)"
   ))))
   sc <- sc[(length(sc) - 1L):(idx + 1L)]
   if (sc[[1L]][[1L]] == ".handleSimpleError") sc <- sc[-1L]