r-lib · romainfrancois · May 25, 2023 · May 24, 2023 · May 24, 2023 · May 24, 2023
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -85,6 +85,7 @@ jobs:
         run: |
           options(warn = 2)
           pak::local_install_dev_deps("cpp11test", dependencies = TRUE)
+          install.packages(".", repos = NULL, type = "source")
           install.packages("cpp11test", repos = NULL, INSTALL_opts = "--install-tests", type = "source")
         shell: Rscript {0}
 

diff --git a/Makefile b/Makefile
@@ -10,11 +10,8 @@ test: all
 
 clean:
 	@Rscript -e 'devtools::clean_dll()'
+	@Rscript -e 'devtools::clean_dll("cpp11test")'
 
 clang_format=`which clang-format`
 format: $(shell find . -name '*.hpp') $(shell find . -name '*.cpp')
-ifeq ($(findstring version 10,$(shell ${clang_format} --version 2>/dev/null)),)
-	@echo "clang-format 10 is required"
-else
 	@${clang_format} -i $?
-endif
diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,7 @@
 # cpp11 (development version)
 
 * `as_doubles()` and `as_integers()` now propagate missing values correctly
-  (#265).
+   (#265, #319).
 
 * Fixed a performance issue related to nested `unwind_protect()` calls (#298).
 

diff --git a/cpp11test/R/cpp11.R b/cpp11test/R/cpp11.R
@@ -8,30 +8,6 @@ data_frame_ <- function() {
   .Call(`_cpp11test_data_frame_`)
 }
 
-my_stop <- function(mystring, myarg) {
-  invisible(.Call(`_cpp11test_my_stop`, mystring, myarg))
-}
-
-my_stop_n1 <- function(mystring) {
-  invisible(.Call(`_cpp11test_my_stop_n1`, mystring))
-}
-
-my_warning <- function(mystring, myarg) {
-  invisible(.Call(`_cpp11test_my_warning`, mystring, myarg))
-}
-
-my_warning_n1 <- function(mystring) {
-  invisible(.Call(`_cpp11test_my_warning_n1`, mystring))
-}
-
-my_message <- function(mystring, myarg) {
-  invisible(.Call(`_cpp11test_my_message`, mystring, myarg))
-}
-
-my_message_n1 <- function(mystring) {
-  invisible(.Call(`_cpp11test_my_message_n1`, mystring))
-}
-
 my_stop_n1fmt <- function(mystring) {
   invisible(.Call(`_cpp11test_my_stop_n1fmt`, mystring))
 }
@@ -56,6 +32,30 @@ my_message_n2fmt <- function(mystring, myarg) {
   invisible(.Call(`_cpp11test_my_message_n2fmt`, mystring, myarg))
 }
 
+my_stop <- function(mystring, myarg) {
+  invisible(.Call(`_cpp11test_my_stop`, mystring, myarg))
+}
+
+my_stop_n1 <- function(mystring) {
+  invisible(.Call(`_cpp11test_my_stop_n1`, mystring))
+}
+
+my_warning <- function(mystring, myarg) {
+  invisible(.Call(`_cpp11test_my_warning`, mystring, myarg))
+}
+
+my_warning_n1 <- function(mystring) {
+  invisible(.Call(`_cpp11test_my_warning_n1`, mystring))
+}
+
+my_message <- function(mystring, myarg) {
+  invisible(.Call(`_cpp11test_my_message`, mystring, myarg))
+}
+
+my_message_n1 <- function(mystring) {
+  invisible(.Call(`_cpp11test_my_message_n1`, mystring))
+}
+
 remove_altrep <- function(x) {
   .Call(`_cpp11test_remove_altrep`, x)
 }
@@ -160,6 +160,34 @@ cpp11_safe_ <- function(x_sxp) {
   .Call(`_cpp11test_cpp11_safe_`, x_sxp)
 }
 
+sum_dbl_for_ <- function(x) {
+  .Call(`_cpp11test_sum_dbl_for_`, x)
+}
+
+sum_dbl_for2_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_dbl_for2_`, x_sxp)
+}
+
+sum_dbl_for3_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_dbl_for3_`, x_sxp)
+}
+
+sum_dbl_foreach_ <- function(x) {
+  .Call(`_cpp11test_sum_dbl_foreach_`, x)
+}
+
+sum_dbl_foreach2_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_dbl_foreach2_`, x_sxp)
+}
+
+sum_dbl_accumulate_ <- function(x) {
+  .Call(`_cpp11test_sum_dbl_accumulate_`, x)
+}
+
+sum_dbl_accumulate2_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_dbl_accumulate2_`, x_sxp)
+}
+
 sum_int_for_ <- function(x) {
   .Call(`_cpp11test_sum_int_for_`, x)
 }
@@ -195,31 +223,3 @@ rcpp_sum_dbl_accumulate_ <- function(x_sxp) {
 rcpp_grow_ <- function(n_sxp) {
   .Call(`_cpp11test_rcpp_grow_`, n_sxp)
 }
-
-sum_dbl_for_ <- function(x) {
-  .Call(`_cpp11test_sum_dbl_for_`, x)
-}
-
-sum_dbl_for2_ <- function(x_sxp) {
-  .Call(`_cpp11test_sum_dbl_for2_`, x_sxp)
-}
-
-sum_dbl_for3_ <- function(x_sxp) {
-  .Call(`_cpp11test_sum_dbl_for3_`, x_sxp)
-}
-
-sum_dbl_foreach_ <- function(x) {
-  .Call(`_cpp11test_sum_dbl_foreach_`, x)
-}
-
-sum_dbl_foreach2_ <- function(x_sxp) {
-  .Call(`_cpp11test_sum_dbl_foreach2_`, x_sxp)
-}
-
-sum_dbl_accumulate_ <- function(x) {
-  .Call(`_cpp11test_sum_dbl_accumulate_`, x)
-}
-
-sum_dbl_accumulate2_ <- function(x_sxp) {
-  .Call(`_cpp11test_sum_dbl_accumulate2_`, x_sxp)
-}
diff --git a/cpp11test/src/cpp11.cpp b/cpp11test/src/cpp11.cpp
@@ -21,54 +21,6 @@ extern "C" SEXP _cpp11test_data_frame_() {
     return cpp11::as_sexp(data_frame_());
   END_CPP11
 }
-// errors_fmt.cpp
-void my_stop(std::string mystring, int myarg);
-extern "C" SEXP _cpp11test_my_stop(SEXP mystring, SEXP myarg) {
-  BEGIN_CPP11
-    my_stop(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring), cpp11::as_cpp<cpp11::decay_t<int>>(myarg));
-    return R_NilValue;
-  END_CPP11
-}
-// errors_fmt.cpp
-void my_stop_n1(std::string mystring);
-extern "C" SEXP _cpp11test_my_stop_n1(SEXP mystring) {
-  BEGIN_CPP11
-    my_stop_n1(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring));
-    return R_NilValue;
-  END_CPP11
-}
-// errors_fmt.cpp
-void my_warning(std::string mystring, std::string myarg);
-extern "C" SEXP _cpp11test_my_warning(SEXP mystring, SEXP myarg) {
-  BEGIN_CPP11
-    my_warning(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring), cpp11::as_cpp<cpp11::decay_t<std::string>>(myarg));
-    return R_NilValue;
-  END_CPP11
-}
-// errors_fmt.cpp
-void my_warning_n1(std::string mystring);
-extern "C" SEXP _cpp11test_my_warning_n1(SEXP mystring) {
-  BEGIN_CPP11
-    my_warning_n1(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring));
-    return R_NilValue;
-  END_CPP11
-}
-// errors_fmt.cpp
-void my_message(std::string mystring, std::string myarg);
-extern "C" SEXP _cpp11test_my_message(SEXP mystring, SEXP myarg) {
-  BEGIN_CPP11
-    my_message(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring), cpp11::as_cpp<cpp11::decay_t<std::string>>(myarg));
-    return R_NilValue;
-  END_CPP11
-}
-// errors_fmt.cpp
-void my_message_n1(std::string mystring);
-extern "C" SEXP _cpp11test_my_message_n1(SEXP mystring) {
-  BEGIN_CPP11
-    my_message_n1(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring));
-    return R_NilValue;
-  END_CPP11
-}
 // errors.cpp
 void my_stop_n1fmt(std::string mystring);
 extern "C" SEXP _cpp11test_my_stop_n1fmt(SEXP mystring) {
@@ -117,6 +69,54 @@ extern "C" SEXP _cpp11test_my_message_n2fmt(SEXP mystring, SEXP myarg) {
     return R_NilValue;
   END_CPP11
 }
+// errors_fmt.cpp
+void my_stop(std::string mystring, int myarg);
+extern "C" SEXP _cpp11test_my_stop(SEXP mystring, SEXP myarg) {
+  BEGIN_CPP11
+    my_stop(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring), cpp11::as_cpp<cpp11::decay_t<int>>(myarg));
+    return R_NilValue;
+  END_CPP11
+}
+// errors_fmt.cpp
+void my_stop_n1(std::string mystring);
+extern "C" SEXP _cpp11test_my_stop_n1(SEXP mystring) {
+  BEGIN_CPP11
+    my_stop_n1(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring));
+    return R_NilValue;
+  END_CPP11
+}
+// errors_fmt.cpp
+void my_warning(std::string mystring, std::string myarg);
+extern "C" SEXP _cpp11test_my_warning(SEXP mystring, SEXP myarg) {
+  BEGIN_CPP11
+    my_warning(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring), cpp11::as_cpp<cpp11::decay_t<std::string>>(myarg));
+    return R_NilValue;
+  END_CPP11
+}
+// errors_fmt.cpp
+void my_warning_n1(std::string mystring);
+extern "C" SEXP _cpp11test_my_warning_n1(SEXP mystring) {
+  BEGIN_CPP11
+    my_warning_n1(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring));
+    return R_NilValue;
+  END_CPP11
+}
+// errors_fmt.cpp
+void my_message(std::string mystring, std::string myarg);
+extern "C" SEXP _cpp11test_my_message(SEXP mystring, SEXP myarg) {
+  BEGIN_CPP11
+    my_message(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring), cpp11::as_cpp<cpp11::decay_t<std::string>>(myarg));
+    return R_NilValue;
+  END_CPP11
+}
+// errors_fmt.cpp
+void my_message_n1(std::string mystring);
+extern "C" SEXP _cpp11test_my_message_n1(SEXP mystring) {
+  BEGIN_CPP11
+    my_message_n1(cpp11::as_cpp<cpp11::decay_t<std::string>>(mystring));
+    return R_NilValue;
+  END_CPP11
+}
 // find-intervals.cpp
 SEXP remove_altrep(SEXP x);
 extern "C" SEXP _cpp11test_remove_altrep(SEXP x) {
@@ -310,6 +310,55 @@ extern "C" SEXP _cpp11test_cpp11_safe_(SEXP x_sxp) {
     return cpp11::as_sexp(cpp11_safe_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
   END_CPP11
 }
+// sum.cpp
+double sum_dbl_for_(cpp11::doubles x);
+extern "C" SEXP _cpp11test_sum_dbl_for_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_for_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
+  END_CPP11
+}
+// sum.cpp
+double sum_dbl_for2_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_dbl_for2_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_for2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+double sum_dbl_for3_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_dbl_for3_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_for3_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+double sum_dbl_foreach_(cpp11::doubles x);
+extern "C" SEXP _cpp11test_sum_dbl_foreach_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_foreach_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
+  END_CPP11
+}
+// sum.cpp
+double sum_dbl_foreach2_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_dbl_foreach2_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_foreach2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+double sum_dbl_accumulate_(cpp11::doubles x);
+extern "C" SEXP _cpp11test_sum_dbl_accumulate_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_accumulate_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
+  END_CPP11
+}
+// sum.cpp
+double sum_dbl_accumulate2_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_dbl_accumulate2_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_dbl_accumulate2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
 // sum_int.cpp
 double sum_int_for_(cpp11::integers x);
 extern "C" SEXP _cpp11test_sum_int_for_(SEXP x) {
@@ -373,55 +422,6 @@ extern "C" SEXP _cpp11test_rcpp_grow_(SEXP n_sxp) {
     return cpp11::as_sexp(rcpp_grow_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(n_sxp)));
   END_CPP11
 }
-// sum.cpp
-double sum_dbl_for_(cpp11::doubles x);
-extern "C" SEXP _cpp11test_sum_dbl_for_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_for_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
-  END_CPP11
-}
-// sum.cpp
-double sum_dbl_for2_(SEXP x_sxp);
-extern "C" SEXP _cpp11test_sum_dbl_for2_(SEXP x_sxp) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_for2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
-  END_CPP11
-}
-// sum.cpp
-double sum_dbl_for3_(SEXP x_sxp);
-extern "C" SEXP _cpp11test_sum_dbl_for3_(SEXP x_sxp) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_for3_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
-  END_CPP11
-}
-// sum.cpp
-double sum_dbl_foreach_(cpp11::doubles x);
-extern "C" SEXP _cpp11test_sum_dbl_foreach_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_foreach_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
-  END_CPP11
-}
-// sum.cpp
-double sum_dbl_foreach2_(SEXP x_sxp);
-extern "C" SEXP _cpp11test_sum_dbl_foreach2_(SEXP x_sxp) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_foreach2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
-  END_CPP11
-}
-// sum.cpp
-double sum_dbl_accumulate_(cpp11::doubles x);
-extern "C" SEXP _cpp11test_sum_dbl_accumulate_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_accumulate_(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(x)));
-  END_CPP11
-}
-// sum.cpp
-double sum_dbl_accumulate2_(SEXP x_sxp);
-extern "C" SEXP _cpp11test_sum_dbl_accumulate2_(SEXP x_sxp) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(sum_dbl_accumulate2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
-  END_CPP11
-}
 
 extern "C" {
 /* .Call calls */

diff --git a/cpp11test/src/test-doubles.cpp b/cpp11test/src/test-doubles.cpp
@@ -394,10 +394,10 @@ context("doubles-C++") {
     e.push_back("b");
     expect_error(cpp11::as_doubles(e));
 
-    cpp11::writable::integers na;
-    na.push_back(cpp11::na<int>());
+    cpp11::writable::integers na{NA_INTEGER, 42};
     cpp11::doubles na2(cpp11::as_doubles(na));
     expect_true(cpp11::is_na(na2[0]));
+    expect_true(!cpp11::is_na(na2[1]));
   }
 
   test_that("doubles operator[] and at") {