separate 'get_param_str' fn from typetracer_header for #16

mpadge · Jun 22, 2023 · 64522b3 · 64522b3
1 parent fd14e91
commit 64522b3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 35 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: typetracer
 Title: Trace Function Parameter Types
-Version: 0.1.1.022
+Version: 0.1.1.023
 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
@@ -54,23 +54,8 @@ typetracer_header <- function () {
         )
     }
 
-    # Return structure of parameters as character strings
-    # https://rpubs.com/maechler/R_language_objs
-    typetracer_env$get_str <- function (x, max.length = 1000L) { # nolint
-
-        r <- tryCatch (format (x), error = function (e) e)
-        r <- if (inherits (r, "error")) {
-            tryCatch (as.character (x), error = function (e) e)
-        } else {
-            paste (r, collapse = " ")
-        }
-        r <- if (inherits (r, "error")) {
-            tryCatch (utils::capture.output (x), error = function (e) e)
-        } else {
-            paste (r, collapse = " ")
-        }
-        substr (r, 1L, max.length)
-    }
+    # Bring in typetracer internal functions:
+    typetracer_env$get_str <- getFromNamespace ("get_param_str", "typetracer")
 
     typetracer_env$data <- lapply (typetracer_env$par_names, function (p) {
 
@@ -157,3 +142,23 @@ typetracer_header <- function () {
 
     rm (typetracer_env)
 }
+
+#' Return structure of parameters as character strings
+#'
+#' See https://rpubs.com/maechler/R_language_objs
+#' @noRd
+get_param_str <- function (x, max.length = 1000L) { # nolint
+
+    r <- tryCatch (format (x), error = function (e) e)
+    r <- if (inherits (r, "error")) {
+        tryCatch (as.character (x), error = function (e) e)
+    } else {
+        paste (r, collapse = " ")
+    }
+    r <- if (inherits (r, "error")) {
+        tryCatch (utils::capture.output (x), error = function (e) e)
+    } else {
+        paste (r, collapse = " ")
+    }
+    substr (r, 1L, max.length)
+}
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.022",
+  "version": "0.1.1.023",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/tests/testthat/_snaps/trace-fns.md b/tests/testthat/_snaps/trace-fns.md
@@ -27,22 +27,8 @@
               typetracer_env$par_names <- c(typetracer_env$par_names, 
                   typetracer_env$dot_names)
           }
-          typetracer_env$get_str <- function(x, max.length = 1000L) {
-              r <- tryCatch(format(x), error = function(e) e)
-              r <- if (inherits(r, "error")) {
-                  tryCatch(as.character(x), error = function(e) e)
-              }
-              else {
-                  paste(r, collapse = " ")
-              }
-              r <- if (inherits(r, "error")) {
-                  tryCatch(utils::capture.output(x), error = function(e) e)
-              }
-              else {
-                  paste(r, collapse = " ")
-              }
-              substr(r, 1L, max.length)
-          }
+          typetracer_env$get_str <- getFromNamespace("get_param_str", 
+              "typetracer")
           typetracer_env$data <- lapply(typetracer_env$par_names, function(p) {
               res <- NULL
               if (p %in% ls(fn_env)) {