Closes #490 fix_replace_symbol_in_expr: handle NAs and recursions

NEWS.md

@@ -7,6 +7,9 @@ and `@default` tags to specify the permitted and default values and the
 `@caption`, `@info`, and `@code` tags for examples with a caption and a
 description. (#484)
 
+- `replace_symbol_in_expr()` and `add_suffix_to_vars()` no longer fail if the
+expression contains `NA`. (#490)
+
 ## Updates of Existing Functions
 
 ## Breaking Changes

R/quo.R

@@ -58,10 +58,16 @@ replace_values_by_names <- function(expressions) {
 #'
 #' @param expression Expression
 #'
+#' @permitted a quoted expression, e.g., created by `expr()`
+#'
 #' @param target Target symbol
 #'
+#' @permitted [symbol]
+#'
 #' @param replace Replacing symbol
 #'
+#' @permitted [symbol]
+#'
 #' @author Stefan Bundfuss
 #'
 #' @return The expression where every occurrence of the symbol `target` is
@@ -73,12 +79,12 @@ replace_values_by_names <- function(expressions) {
 #' @export
 #'
 #' @examples
-#'
 #' library(rlang)
 #'
 #' replace_symbol_in_expr(expr(AVAL), target = AVAL, replace = AVAL.join)
 #' replace_symbol_in_expr(expr(AVALC), target = AVAL, replace = AVAL.join)
 #' replace_symbol_in_expr(expr(desc(AVAL)), target = AVAL, replace = AVAL.join)
+#' replace_symbol_in_expr(expr(if_else(AVAL > 0, AVAL, NA)), AVAL, AVAL.join)
 replace_symbol_in_expr <- function(expression,
                                    target,
                                    replace) {
@@ -91,8 +97,16 @@ replace_symbol_in_expr <- function(expression,
     }
   } else {
     for (i in seq_along(expression)) {
-      if (expression[[i]] == target) {
-        expression[[i]] <- replace
+      if (is.symbol(expression[[i]])) {
+        if (expression[[i]] == target) {
+          expression[[i]] <- replace
+        }
+      } else if (is.recursive(expression[[i]])) {
+        expression[[i]] <- replace_symbol_in_expr(
+          expression[[i]],
+          !!target,
+          !!replace
+        )
       }
     }
   }

man/roxygen/rdx_meta.R

@@ -1,6 +1,7 @@
 list(
   rdx_permitted_values = list(
     char_scalar = "a character scalar, i.e., a character vector of length one",
+    symbol = "an unquoted symbol, e.g., `AVAL`",
     var_list = "list of variables created by `exprs()`, e.g., `exprs(USUBJID, VISIT)`"
   )
 )

tests/testthat/test-quo.R

@@ -114,9 +114,21 @@ test_that("replace_symbol_in_expr Test 9: symbol in expression is replaced", {
   )
 })
 
+## Test 10: works recursive and with NA ----
+test_that("replace_symbol_in_expr Test 10: works recursive and with NA", {
+  expect_equal(
+    expected = expr(if_else(AVAL.join > 0, AVAL.join, NA)),
+    object = replace_symbol_in_expr(
+      expr(if_else(AVAL > 0, AVAL, NA)),
+      target = AVAL,
+      replace = AVAL.join
+    )
+  )
+})
+
 # add_suffix_to_vars ----
-## Test 10: with single variable ----
-test_that("add_suffix_to_vars Test 10: with single variable", {
+## Test 11: with single variable ----
+test_that("add_suffix_to_vars Test 11: with single variable", {
   expect_equal(
     expected = exprs(ADT, desc(AVAL.join), AVALC),
     object = add_suffix_to_vars(
@@ -127,8 +139,8 @@ test_that("add_suffix_to_vars Test 10: with single variable", {
   )
 })
 
-## Test 11: with more than one variable ----
-test_that("add_suffix_to_vars Test 11: with more than one variable", {
+## Test 12: with more than one variable ----
+test_that("add_suffix_to_vars Test 12: with more than one variable", {
   expect_equal(
     expected = exprs(ADT, desc(AVAL.join), AVALC.join),
     object = add_suffix_to_vars(