Vectorise fix_replacement

Fixes hadley/r4ds#278
tidyverse · Aug 17, 2016 · 4ac3be1 · 4ac3be1
1 parent 918fec2
commit 4ac3be1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/R/replace.r b/R/replace.r
@@ -55,9 +55,9 @@ str_replace <- function(string, pattern, replacement) {
 #' @rdname str_replace
 str_replace_all <- function(string, pattern, replacement) {
   if (!is.null(names(pattern))) {
+    vec <- FALSE
     replacement <- unname(pattern)
     pattern <- names(pattern)
-    vec <- FALSE
   } else {
     vec <- TRUE
   }
@@ -75,6 +75,10 @@ str_replace_all <- function(string, pattern, replacement) {
 }
 
 fix_replacement <- function(x) {
+  vapply(x, fix_replacement_one, character(1), USE.NAMES = FALSE)
+}
+
+fix_replacement_one <- function(x) {
   escape_dollar <- function(x) if (x == "$") "\\$" else x
 
   chars <- str_split(x, "")[[1]]

diff --git a/tests/testthat/test-replace.r b/tests/testthat/test-replace.r
@@ -34,6 +34,11 @@ test_that("replacement strings with capture groups refs and dollar signs work",
   expect_equal(str_replace("aba", "(b)", "\\\\1$\\1$\\\\1"), "a\\1$b$\\1a")
 })
 
+test_that("can replace multiple matches", {
+  x <- c("a1", "b2")
+  y <- str_replace_all(x, c("a" = "1", "b" = "2"))
+  expect_equal(y, c("11", "22"))
+})
 
 # fix_replacement ---------------------------------------------------------