Dependency to pryr eliminated

Author: phgrosjean

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: chart
 Type: Package
-Version: 1.5.4
+Version: 1.5.5
 Title: 'SciViews::R' - Unified Interface (with Formula) for R Plots
 Description: Chart generalizes plot generation in R, being with base R plot
   function, lattice or ggplot2. A formula interface is available for both
@@ -22,7 +22,6 @@ Imports:
     graphics (>= 4.2.0),
     grDevices (>= 4.2.0),
     latticeExtra (>= 0.6.30),
-    pryr (>= 0.1.6),
     rlang (>= 1.1.1),
     scales (>= 1.2.1),
     stats (>= 4.2.0),

NAMESPACE

@@ -29,7 +29,6 @@ importFrom(ggpubr,ggarrange)
 importFrom(latticeExtra,custom.theme)
 importFrom(latticeExtra,ggplot2like)
 importFrom(latticeExtra,ggplot2like.opts)
-importFrom(pryr,modify_lang)
 importFrom(rlang,abort)
 importFrom(rlang,env_label)
 importFrom(rlang,f_env)

NEWS.md

@@ -1,3 +1,7 @@
+# chart 1.5.5
+
+-   Dependency to {pryr} is removed, since the package is archived from CRAN. A copy of its `modify_lang()` function is added here to get rid of that dependency.
+
 # chart 1.5.4
 
 -   Uses `aka()`, `section()` and `label()` from {svBase} (>= 1.7.0). No more dependencies to {data.io} and {svMisc}.

R/chart-internal.R

@@ -81,3 +81,29 @@ as_formula <- as.formula
 .base_to_ggplot <- c(col = "colour", color = "colour", pch = "shape",
   cex = "size", lty = "linetype", lwd = "size", srt = "angle", adj = "hjust",
   bg = "fill", fg = "colour", min = "ymin", max = "ymax")
+
+# This was pryr::modify_lang(), but pryr is now archived from CRAN.
+.modify_lang <- function(x, f, ...) {
+  recurse <- function(y) {
+    lapply(y, .modify_lang, f = f, ...)
+  }
+
+  if (is.atomic(x) || is.name(x)) {
+    f(x, ...)
+  } else if (is.call(x)) {
+    as.call(recurse(x))
+  } else if (is.function(x)) {
+    formals(x) <- .modify_lang(formals(x), f, ...)
+    body(x) <- .modify_lang(body(x), f, ...)
+    x
+  } else if (is.pairlist(x)) {
+    as.pairlist(recurse(x))
+  } else if (is.expression(x)) {
+    as.expression(recurse(x))
+  } else if (is.list(x)) {
+    recurse(x)
+  } else {
+    stop("Unknown language class: ", paste(class(x), collapse = "/"),
+      call. = FALSE)
+  }
+}

R/chart-package.R

@@ -27,7 +27,6 @@
 #' @importFrom rlang abort warn env_label f_env f_lhs f_rhs is_true is_quosure
 #' @importFrom stats as.formula asOneSidedFormula
 #' @importFrom utils .DollarNames apropos modifyList
-#' @importFrom pryr modify_lang
 #' @importFrom ggplotify as.ggplot
 #' @importFrom ggpubr ggarrange
 #' @importFrom svBase aka section label

R/chart.R

@@ -226,7 +226,7 @@ chart.default <- function(data, specif = NULL, formula = NULL, mapping = NULL,
             vars <- all.vars(form)
             vars <- vars[vars %in% dnames]
             for (var in vars) {
-              expr <- pryr::modify_lang(expr, function(x)
+              expr <- .modify_lang(expr, function(x)
                 if (is.name(x) && identical(x, as.name(var)))
                   as.name(labels[[var]]) else x)
             }

inst/WORDLIST

@@ -10,6 +10,7 @@ modelit
 ORCID
 OSX
 pipeable
+pryr
 README
 reusability
 SciViews