Merge pull request #268 from yutannihilation/stri-sub-replacement

"omit_na=TRUE" keeps the string as is if the replacement is NA

Author: gagolews

R/sub.R

@@ -74,8 +74,8 @@
 #' @param from integer vector or two-column matrix
 #' @param to integer vector; mutually exclusive with \code{length} and \code{from} being a matrix
 #' @param length integer vector; mutually exclusive with \code{to} and \code{from} being a matrix
-#' @param omit_na single logical value; if \code{TRUE}, missing values in \code{from},
-#' \code{to}, or \code{length} will result in an unchanged input; replacement function only
+#' @param omit_na single logical value; if \code{TRUE}, missing values in any of the arguments
+#' provided will result in an unchanged input; replacement function only
 #' @param value character vector to be substituted with; replacement function only
 #'
 #'

devel/testthat/test-sub.R

@@ -71,6 +71,10 @@ test_that("stri_sub<-", {
    s <- c("a;b", "c:d"); stri_sub(s, stri_locate_first_fixed(s, ";"), omit_na=FALSE) <- "_"; expect_identical(s, c("a_b", NA))
    s <- c("a;b", "c:d"); stri_sub(s, stri_locate_first_fixed(s, ";")) <- "_"; expect_identical(s, c("a_b", NA))
 
+   s <- c("a;b", "c:d"); stri_sub(s, stri_locate_first_fixed(s, ";"), omit_na=TRUE) <- c("_", NA); expect_identical(s, c("a_b", "c:d"))
+   s <- c("a;b", "c:d"); stri_sub(s, stri_locate_first_fixed(s, ";"), omit_na=FALSE) <- c("_", NA); expect_identical(s, c("a_b", NA))
+   s <- c("a;b", "c:d"); stri_sub(s, stri_locate_first_fixed(s, ";")) <- c("_", NA); expect_identical(s, c("a_b", NA))
+   
    s <- "\u0106a\u0105";  stri_sub(s,0,to=0) <- "x"; expect_identical(s, "x\u0106a\u0105")
    s <- "\u0106a\u0105";  stri_sub(s,1,to=0) <- "x"; expect_identical(s, "x\u0106a\u0105")
    s <- "\u0106a\u0105";  stri_sub(s,2,to=0) <- "x"; expect_identical(s, "\u0106xa\u0105")

man/stri_sub.Rd

@@ -293,13 +293,10 @@ SEXP stri_sub_replacement(SEXP str, SEXP from, SEXP to, SEXP length, SEXP omit_n
    {
       R_len_t cur_from     = from_tab[i % from_len];
       R_len_t cur_to       = (to_tab)?to_tab[i % to_len]:length_tab[i % length_len];
-      if (str_cont.isNA(i) || value_cont.isNA(i)) {
-         SET_STRING_ELT(ret, i, NA_STRING);
-         continue;
-      }
-
-      if (cur_from == NA_INTEGER || cur_to == NA_INTEGER) {
+      
+      if (str_cont.isNA(i) || value_cont.isNA(i) || cur_from == NA_INTEGER || cur_to == NA_INTEGER) {
          if (omit_na_1) {
+            // if str_conf is NA, this will be NA_STRING as well.
             SET_STRING_ELT(ret, i, str_cont.toR(i));
          }
          else {