fix sum rcpp error on Unix systems (cpp11test) - replaces r-lib#439

Author: pachadotdev

cpp11test/DESCRIPTION

@@ -12,14 +12,12 @@ Authors@R:
 Description: Provides a test suite and benchmarking code for the 'cpp11' package.
 License: MIT + file LICENSE
 Encoding: UTF-8
-LinkingTo: cpp11, Rcpp, testthat
-Imports: cpp11, Rcpp
+LinkingTo: Rcpp, cpp11, testthat
 Suggests:
     covr,
-    testthat (>= 3.0.0),
+    testthat,
     pkgload,
     xml2
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
-Config/testthat/edition: 3
+RoxygenNote: 7.1.1

cpp11test/NAMESPACE

@@ -1,12 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
-export(roxcpp2_)
-export(roxcpp3_)
-export(roxcpp4_)
-export(roxcpp5_)
-export(roxcpp7_)
 export(run_tests)
 exportPattern("_$")
 importFrom(Rcpp,sourceCpp)
-importFrom(cpp11,cpp_source)
 useDynLib(cpp11test, .registration = TRUE)

cpp11test/R/cpp11.R

@@ -160,57 +160,28 @@ notroxcpp1_ <- function(x) {
   .Call(`_cpp11test_notroxcpp1_`, x)
 }
 
-#' @title Roxygenise C++ function II
-#' @param x numeric value
-#' @description Dummy function to test roxygen2. It adds 2.0 to a double.
-#' @export
-#' @examples roxcpp2_(1.0)
 roxcpp2_ <- function(x) {
-	.Call(`_cpp11test_roxcpp2_`, x)
+  .Call(`_cpp11test_roxcpp2_`, x)
 }
 
-#' @title Roxygenise C++ function III
-#' @param x numeric value
-#' @description Dummy function to test roxygen2. It adds 3.0 to a double.
-#' @export
-#' @examples roxcpp3_(1.0)
 roxcpp3_ <- function(x) {
-	.Call(`_cpp11test_roxcpp3_`, x)
+  .Call(`_cpp11test_roxcpp3_`, x)
 }
 
-#' @title Roxygenise C++ function IV
-#' @param x numeric value
-#' @description Dummy function to test roxygen2. It adds 4.0 to a double.
-#' @export
-#' @examples roxcpp4_(1.0)
 roxcpp4_ <- function(x) {
-	.Call(`_cpp11test_roxcpp4_`, x)
+  .Call(`_cpp11test_roxcpp4_`, x)
 }
 
-#' @title Roxygenise C++ function V
-#' @param x numeric value
-#' @description Dummy function to test roxygen2. It adds 5.0 to a double.
-#' @export
-#' @examples roxcpp5_(1.0)
 roxcpp5_ <- function(x) {
-	.Call(`_cpp11test_roxcpp5_`, x)
+  .Call(`_cpp11test_roxcpp5_`, x)
 }
 
 notroxcpp6_ <- function(x) {
   .Call(`_cpp11test_notroxcpp6_`, x)
 }
 
-#' @title Roxygenise C++ function VII
-#' @param x numeric value
-#' @description Dummy function to test roxygen2. It adds 7.0 to a double.
-#' @export
-#' @examples
-#' my_fun <- function(x) {
-#'   roxcpp7_(x)
-#' }
-#' @seealso \code{\link{roxcpp1_}}
 roxcpp7_ <- function(x) {
-	.Call(`_cpp11test_roxcpp7_`, x)
+  .Call(`_cpp11test_roxcpp7_`, x)
 }
 
 cpp11_safe_ <- function(x_sxp) {

cpp11test/R/cpp11test-package.R

@@ -1,8 +1,6 @@
 #' @keywords internal
 #' @exportPattern "_$"
-#' @importFrom cpp11 cpp_source
 #' @importFrom Rcpp sourceCpp
-NULL
 "_PACKAGE"
 
 # The following block is used by usethis to automatically manage

cpp11test/R/test.R

@@ -22,5 +22,6 @@ run_tests <- function(reporter = testthat::default_reporter()) {
   on.exit(setwd(old))
   setwd(system.file("tests", package = "cpp11test"))
 
-  testthat::test_check("cpp11test", reporter = reporter)
+  library(testthat)
+  test_check("cpp11test", reporter = reporter)
 }

cpp11test/man/cpp11test-package.Rd

@@ -303,55 +303,6 @@ extern "C" SEXP _cpp11test_rcpp_release_(SEXP n) {
     return R_NilValue;
   END_CPP11
 }
-// roxygen1.cpp
-double notroxcpp1_(double x);
-extern "C" SEXP _cpp11test_notroxcpp1_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(notroxcpp1_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
-// roxygen1.cpp
-double roxcpp2_(double x);
-extern "C" SEXP _cpp11test_roxcpp2_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(roxcpp2_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
-// roxygen2.cpp
-double roxcpp3_(double x);
-extern "C" SEXP _cpp11test_roxcpp3_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(roxcpp3_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
-// roxygen2.cpp
-double roxcpp4_(double x);
-extern "C" SEXP _cpp11test_roxcpp4_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(roxcpp4_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
-// roxygen3.cpp
-double roxcpp5_(double x);
-extern "C" SEXP _cpp11test_roxcpp5_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(roxcpp5_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
-// roxygen3.cpp
-double notroxcpp6_(double x);
-extern "C" SEXP _cpp11test_notroxcpp6_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(notroxcpp6_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
-// roxygen3.cpp
-double roxcpp7_(double x);
-extern "C" SEXP _cpp11test_roxcpp7_(SEXP x) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(roxcpp7_(cpp11::as_cpp<cpp11::decay_t<double>>(x)));
-  END_CPP11
-}
 // safe.cpp
 SEXP cpp11_safe_(SEXP x_sxp);
 extern "C" SEXP _cpp11test_cpp11_safe_(SEXP x_sxp) {
@@ -373,41 +324,6 @@ extern "C" SEXP _cpp11test_string_push_back_() {
     return cpp11::as_sexp(string_push_back_());
   END_CPP11
 }
-// strings.cpp
-cpp11::strings grow_strings_cpp11_(size_t n, int seed);
-extern "C" SEXP _cpp11test_grow_strings_cpp11_(SEXP n, SEXP seed) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(grow_strings_cpp11_(cpp11::as_cpp<cpp11::decay_t<size_t>>(n), cpp11::as_cpp<cpp11::decay_t<int>>(seed)));
-  END_CPP11
-}
-// strings.cpp
-Rcpp::CharacterVector grow_strings_rcpp_(size_t n, int seed);
-extern "C" SEXP _cpp11test_grow_strings_rcpp_(SEXP n, SEXP seed) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(grow_strings_rcpp_(cpp11::as_cpp<cpp11::decay_t<size_t>>(n), cpp11::as_cpp<cpp11::decay_t<int>>(seed)));
-  END_CPP11
-}
-// strings.cpp
-SEXP grow_strings_manual_(size_t n, int seed);
-extern "C" SEXP _cpp11test_grow_strings_manual_(SEXP n, SEXP seed) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(grow_strings_manual_(cpp11::as_cpp<cpp11::decay_t<size_t>>(n), cpp11::as_cpp<cpp11::decay_t<int>>(seed)));
-  END_CPP11
-}
-// strings.cpp
-cpp11::strings assign_cpp11_(size_t n, int seed);
-extern "C" SEXP _cpp11test_assign_cpp11_(SEXP n, SEXP seed) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(assign_cpp11_(cpp11::as_cpp<cpp11::decay_t<size_t>>(n), cpp11::as_cpp<cpp11::decay_t<int>>(seed)));
-  END_CPP11
-}
-// strings.cpp
-Rcpp::CharacterVector assign_rcpp_(size_t n, int seed);
-extern "C" SEXP _cpp11test_assign_rcpp_(SEXP n, SEXP seed) {
-  BEGIN_CPP11
-    return cpp11::as_sexp(assign_rcpp_(cpp11::as_cpp<cpp11::decay_t<size_t>>(n), cpp11::as_cpp<cpp11::decay_t<int>>(seed)));
-  END_CPP11
-}
 // sum.cpp
 double sum_dbl_for_(cpp11::doubles x);
 extern "C" SEXP _cpp11test_sum_dbl_for_(SEXP x) {
@@ -527,20 +443,6 @@ extern "C" SEXP _cpp11test_rcpp_push_and_truncate_(SEXP size_sxp) {
     return cpp11::as_sexp(rcpp_push_and_truncate_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(size_sxp)));
   END_CPP11
 }
-// test-external_pointer.cpp
-cpp11::external_pointer<int> nullable_extptr_1();
-extern "C" SEXP _cpp11test_nullable_extptr_1() {
-  BEGIN_CPP11
-    return cpp11::as_sexp(nullable_extptr_1());
-  END_CPP11
-}
-// test-external_pointer.cpp
-cpp11::external_pointer<int> nullable_extptr_2();
-extern "C" SEXP _cpp11test_nullable_extptr_2() {
-  BEGIN_CPP11
-    return cpp11::as_sexp(nullable_extptr_2());
-  END_CPP11
-}
 // test-protect-nested.cpp
 void test_destruction_inner();
 extern "C" SEXP _cpp11test_test_destruction_inner() {
@@ -570,8 +472,6 @@ extern "C" {
 extern SEXP run_testthat_tests(SEXP);
 
 static const R_CallMethodDef CallEntries[] = {
-    {"_cpp11test_assign_cpp11_",            (DL_FUNC) &_cpp11test_assign_cpp11_,            2},
-    {"_cpp11test_assign_rcpp_",             (DL_FUNC) &_cpp11test_assign_rcpp_,             2},
     {"_cpp11test_col_sums",                 (DL_FUNC) &_cpp11test_col_sums,                 1},
     {"_cpp11test_cpp11_add_vec_for_",       (DL_FUNC) &_cpp11test_cpp11_add_vec_for_,       2},
     {"_cpp11test_cpp11_insert_",            (DL_FUNC) &_cpp11test_cpp11_insert_,            1},
@@ -588,9 +488,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_gibbs_rcpp",               (DL_FUNC) &_cpp11test_gibbs_rcpp,               2},
     {"_cpp11test_gibbs_rcpp2",              (DL_FUNC) &_cpp11test_gibbs_rcpp2,              2},
     {"_cpp11test_grow_",                    (DL_FUNC) &_cpp11test_grow_,                    1},
-    {"_cpp11test_grow_strings_cpp11_",      (DL_FUNC) &_cpp11test_grow_strings_cpp11_,      2},
-    {"_cpp11test_grow_strings_manual_",     (DL_FUNC) &_cpp11test_grow_strings_manual_,     2},
-    {"_cpp11test_grow_strings_rcpp_",       (DL_FUNC) &_cpp11test_grow_strings_rcpp_,       2},
     {"_cpp11test_my_message",               (DL_FUNC) &_cpp11test_my_message,               2},
     {"_cpp11test_my_message_n1",            (DL_FUNC) &_cpp11test_my_message_n1,            1},
     {"_cpp11test_my_message_n1fmt",         (DL_FUNC) &_cpp11test_my_message_n1fmt,         1},
@@ -603,8 +500,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_my_warning_n1",            (DL_FUNC) &_cpp11test_my_warning_n1,            1},
     {"_cpp11test_my_warning_n1fmt",         (DL_FUNC) &_cpp11test_my_warning_n1fmt,         1},
     {"_cpp11test_my_warning_n2fmt",         (DL_FUNC) &_cpp11test_my_warning_n2fmt,         2},
-    {"_cpp11test_nullable_extptr_1",        (DL_FUNC) &_cpp11test_nullable_extptr_1,        0},
-    {"_cpp11test_nullable_extptr_2",        (DL_FUNC) &_cpp11test_nullable_extptr_2,        0},
     {"_cpp11test_protect_many_",            (DL_FUNC) &_cpp11test_protect_many_,            1},
     {"_cpp11test_protect_many_cpp11_",      (DL_FUNC) &_cpp11test_protect_many_cpp11_,      1},
     {"_cpp11test_protect_many_preserve_",   (DL_FUNC) &_cpp11test_protect_many_preserve_,   1},
@@ -623,11 +518,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_rcpp_sum_int_for_",        (DL_FUNC) &_cpp11test_rcpp_sum_int_for_,        1},
     {"_cpp11test_remove_altrep",            (DL_FUNC) &_cpp11test_remove_altrep,            1},
     {"_cpp11test_row_sums",                 (DL_FUNC) &_cpp11test_row_sums,                 1},
-    {"_cpp11test_roxcpp2_",                 (DL_FUNC) &_cpp11test_roxcpp2_,                 1},
-    {"_cpp11test_roxcpp3_",                 (DL_FUNC) &_cpp11test_roxcpp3_,                 1},
-    {"_cpp11test_roxcpp4_",                 (DL_FUNC) &_cpp11test_roxcpp4_,                 1},
-    {"_cpp11test_roxcpp5_",                 (DL_FUNC) &_cpp11test_roxcpp5_,                 1},
-    {"_cpp11test_roxcpp7_",                 (DL_FUNC) &_cpp11test_roxcpp7_,                 1},
     {"_cpp11test_string_proxy_assignment_", (DL_FUNC) &_cpp11test_string_proxy_assignment_, 0},
     {"_cpp11test_string_push_back_",        (DL_FUNC) &_cpp11test_string_push_back_,        0},
     {"_cpp11test_sum_dbl_accumulate2_",     (DL_FUNC) &_cpp11test_sum_dbl_accumulate2_,     1},

cpp11test/src/cpp11.cpp

@@ -1,8 +1,4 @@
 #include "cpp11/strings.hpp"
-#include <random>
-#include <vector>
-
-#include <Rcpp.h>
 
 // Test benchmark for string proxy assignment performance.
 // We don't unwind_protect() before each `SET_STRING_ELT()` call,
@@ -37,93 +33,3 @@
 
   return x;
 }
-
-// issue 406
-
-std::random_device rd;
-std::mt19937 gen(rd());
-
-double random_double() {
-  std::uniform_real_distribution<double> dist(0.0, 1.0);
-  return dist(gen);
-}
-
-int random_int(int min, int max) {
-  std::uniform_int_distribution<int> dist(min, max);
-  return dist(gen);
-}
-
-std::string random_string() {
-  std::string s(10, '\0');
-  for (size_t i = 0; i < 10; i++) {
-    s[i] = random_int(0, 25) + 'a';
-  }
-  return s;
-}
-
-[[cpp11::register]] cpp11::strings grow_strings_cpp11_(size_t n, int seed) {
-  gen.seed(seed);
-  cpp11::writable::strings x;
-  for (size_t i = 0; i < n; ++i) {
-    x.push_back(random_string());
-  }
-  return x;
-}
-
-[[cpp11::register]] Rcpp::CharacterVector grow_strings_rcpp_(size_t n, int seed) {
-  gen.seed(seed);
-  Rcpp::CharacterVector x(n);
-  for (size_t i = 0; i < n; ++i) {
-    x[i] = random_string();
-  }
-  return x;
-}
-
-[[cpp11::register]] SEXP grow_strings_manual_(size_t n, int seed) {
-  gen.seed(seed);
-  SEXP data_ = PROTECT(Rf_allocVector(STRSXP, 0));
-  size_t size_ = 0;
-  size_t capacity_ = 0;
-  for (size_t i = 0; i < n; ++i) {
-    if (size_ == capacity_) {
-      capacity_ = capacity_ == 0 ? 1 : capacity_ * 2;
-      SEXP new_data_ = PROTECT(Rf_allocVector(STRSXP, capacity_));
-      for (size_t j = 0; j < size_; ++j) {
-        SET_STRING_ELT(new_data_, j, STRING_ELT(data_, j));
-      }
-      UNPROTECT(2);
-      data_ = PROTECT(new_data_);
-    }
-    SET_STRING_ELT(data_, size_++, Rf_mkChar(random_string().c_str()));
-  }
-  // copy back down to size
-  if (size_ < capacity_) {
-    SEXP new_data_ = PROTECT(Rf_allocVector(STRSXP, size_));
-    for (size_t j = 0; j < size_; ++j) {
-      SET_STRING_ELT(new_data_, j, STRING_ELT(data_, j));
-    }
-    UNPROTECT(2);
-    return new_data_;
-  } else {
-    UNPROTECT(1);
-    return data_;
-  }
-}
-
-[[cpp11::register]] cpp11::strings assign_cpp11_(size_t n, int seed) {
-  gen.seed(seed);
-  cpp11::writable::strings x(n);
-  for (size_t i = 0; i < n; ++i) {
-    x[i] = random_string();
-  }
-  return x;
-}
-
-[[cpp11::register]] Rcpp::CharacterVector assign_rcpp_(size_t n, int seed) {
-  gen.seed(seed);
-  Rcpp::CharacterVector x(n);
-  for (size_t i = 0; i < n; ++i) {
-    x[i] = random_string();
-  }
-  return x;
-}