remove 'typetracer' calls from call_env data for #14

mpadge · Jun 21, 2023 · 5bb87bb · 5bb87bb
1 parent 5da1437
commit 5bb87bb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: typetracer
 Title: Trace Function Parameter Types
-Version: 0.1.1.013
+Version: 0.1.1.014
 Authors@R: c(
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2172-5265")),

diff --git a/R/tracer-define.R b/R/tracer-define.R
@@ -129,8 +129,11 @@ typetracer_header <- function () {
         if (length (index) > 0L) {
             call_envs$namespace [index] <- trace_dat$scope [index]
         }
-        call_envs <-
-            call_envs [which (!call_envs$name == typetracer_env$fn_name), ]
+        call_envs <- call_envs [which (call_envs$namespace != "typetracer"), ]
+        if (nrow (call_envs) > 0L) {
+            # assume first branch of trace_back is desired env
+            call_envs <- call_envs [1, ]
+        }
 
         list (
             par = p,

diff --git a/codemeta.json b/codemeta.json
@@ -11,7 +11,7 @@
   "codeRepository": "https://github.com/mpadge/typetracer",
   "issueTracker": "https://github.com/mpadge/typetracer/issues",
   "license": "https://spdx.org/licenses/MIT",
-  "version": "0.1.1.013",
+  "version": "0.1.1.014",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/tests/testthat/_snaps/trace-fns.md b/tests/testthat/_snaps/trace-fns.md
@@ -83,8 +83,11 @@
               if (length(index) > 0L) {
                   call_envs$namespace[index] <- trace_dat$scope[index]
               }
-              call_envs <- call_envs[which(!call_envs$name == typetracer_env$fn_name), 
+              call_envs <- call_envs[which(call_envs$namespace != "typetracer"), 
                   ]
+              if (nrow(call_envs) > 0L) {
+                  call_envs <- call_envs[1, ]
+              }
               list(par = p, class = class(res), typeof = typeof(res), 
                   storage_mode = storage.mode(res), mode = mode(res), 
                   length = length(res), par_uneval = s, par_eval = res,