Port complex-number support (squashed)

Ported complex-number related changes from 'complex' into 'complex-lean': r_complex, complexes specializations, std::complex conversions in as.hpp, r_vector adjustments, and matrix typedefs. Kept only complex-related edits.

Author: pachadotdev

Makefile

@@ -3,8 +3,13 @@ all:
 	@Rscript -e 'devtools::load_all("cpp11test")'
 	@echo "make: Leaving directory 'cpp11test/src'"
 
+install:
+	@Rscript -e 'devtools::document()'
+	@Rscript -e 'devtools::install()'
+
 test: all
-	@echo "make: Entering directory 'cpp11test/tests/testthat'"
+	@echo "make: Entering directory 'cpp11test'"
+	@Rscript -e 'devtools::document("cpp11test")'
 	@Rscript -e 'devtools::test("cpp11test")'
 	@echo "make: Leaving directory 'cpp11test/tests/testthat'"
 

cpp11test/DESCRIPTION

@@ -20,4 +20,4 @@ Suggests:
     xml2
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1
+RoxygenNote: 7.3.2

cpp11test/R/cpp11.R

@@ -84,6 +84,10 @@ grow_ <- function(n) {
   .Call(`_cpp11test_grow_`, n)
 }
 
+grow_cplx_ <- function(n) {
+  .Call(`_cpp11test_grow_cplx_`, n)
+}
+
 cpp11_insert_ <- function(num_sxp) {
   .Call(`_cpp11test_cpp11_insert_`, num_sxp)
 }
@@ -156,34 +160,6 @@ rcpp_release_ <- function(n) {
   invisible(.Call(`_cpp11test_rcpp_release_`, n))
 }
 
-notroxcpp1_ <- function(x) {
-  .Call(`_cpp11test_notroxcpp1_`, x)
-}
-
-roxcpp2_ <- function(x) {
-  .Call(`_cpp11test_roxcpp2_`, x)
-}
-
-roxcpp3_ <- function(x) {
-  .Call(`_cpp11test_roxcpp3_`, x)
-}
-
-roxcpp4_ <- function(x) {
-  .Call(`_cpp11test_roxcpp4_`, x)
-}
-
-roxcpp5_ <- function(x) {
-  .Call(`_cpp11test_roxcpp5_`, x)
-}
-
-notroxcpp6_ <- function(x) {
-  .Call(`_cpp11test_notroxcpp6_`, x)
-}
-
-roxcpp7_ <- function(x) {
-  .Call(`_cpp11test_roxcpp7_`, x)
-}
-
 cpp11_safe_ <- function(x_sxp) {
   .Call(`_cpp11test_cpp11_safe_`, x_sxp)
 }
@@ -196,26 +172,6 @@ string_push_back_ <- function() {
   .Call(`_cpp11test_string_push_back_`)
 }
 
-grow_strings_cpp11_ <- function(n, seed) {
-  .Call(`_cpp11test_grow_strings_cpp11_`, n, seed)
-}
-
-grow_strings_rcpp_ <- function(n, seed) {
-  .Call(`_cpp11test_grow_strings_rcpp_`, n, seed)
-}
-
-grow_strings_manual_ <- function(n, seed) {
-  .Call(`_cpp11test_grow_strings_manual_`, n, seed)
-}
-
-assign_cpp11_ <- function(n, seed) {
-  .Call(`_cpp11test_assign_cpp11_`, n, seed)
-}
-
-assign_rcpp_ <- function(n, seed) {
-  .Call(`_cpp11test_assign_rcpp_`, n, seed)
-}
-
 sum_dbl_for_ <- function(x) {
   .Call(`_cpp11test_sum_dbl_for_`, x)
 }
@@ -244,6 +200,42 @@ sum_dbl_accumulate2_ <- function(x_sxp) {
   .Call(`_cpp11test_sum_dbl_accumulate2_`, x_sxp)
 }
 
+sum_cplx_for_ <- function(x) {
+  .Call(`_cpp11test_sum_cplx_for_`, x)
+}
+
+sum_cplx_for_2_ <- function(x) {
+  .Call(`_cpp11test_sum_cplx_for_2_`, x)
+}
+
+sum_cplx_for_3_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_cplx_for_3_`, x_sxp)
+}
+
+sum_cplx_for_4_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_cplx_for_4_`, x_sxp)
+}
+
+sum_cplx_for_5_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_cplx_for_5_`, x_sxp)
+}
+
+sum_cplx_for_6_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_cplx_for_6_`, x_sxp)
+}
+
+sum_cplx_foreach_ <- function(x) {
+  .Call(`_cpp11test_sum_cplx_foreach_`, x)
+}
+
+sum_cplx_accumulate_ <- function(x) {
+  .Call(`_cpp11test_sum_cplx_accumulate_`, x)
+}
+
+sum_cplx_for2_ <- function(x_sxp) {
+  .Call(`_cpp11test_sum_cplx_for2_`, x_sxp)
+}
+
 sum_int_for_ <- function(x) {
   .Call(`_cpp11test_sum_int_for_`, x)
 }
@@ -284,14 +276,6 @@ rcpp_push_and_truncate_ <- function(size_sxp) {
   .Call(`_cpp11test_rcpp_push_and_truncate_`, size_sxp)
 }
 
-nullable_extptr_1 <- function() {
-  .Call(`_cpp11test_nullable_extptr_1`)
-}
-
-nullable_extptr_2 <- function() {
-  .Call(`_cpp11test_nullable_extptr_2`)
-}
-
 test_destruction_inner <- function() {
   invisible(.Call(`_cpp11test_test_destruction_inner`))
 }

cpp11test/man/roxcpp2_.Rd

@@ -166,6 +166,13 @@ extern "C" SEXP _cpp11test_grow_(SEXP n) {
     return cpp11::as_sexp(grow_(cpp11::as_cpp<cpp11::decay_t<R_xlen_t>>(n)));
   END_CPP11
 }
+// grow.cpp
+cpp11::writable::complexes grow_cplx_(R_xlen_t n);
+extern "C" SEXP _cpp11test_grow_cplx_(SEXP n) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(grow_cplx_(cpp11::as_cpp<cpp11::decay_t<R_xlen_t>>(n)));
+  END_CPP11
+}
 // insert.cpp
 SEXP cpp11_insert_(SEXP num_sxp);
 extern "C" SEXP _cpp11test_cpp11_insert_(SEXP num_sxp) {
@@ -373,6 +380,69 @@ extern "C" SEXP _cpp11test_sum_dbl_accumulate2_(SEXP x_sxp) {
     return cpp11::as_sexp(sum_dbl_accumulate2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
   END_CPP11
 }
+// sum.cpp
+cpp11::r_complex sum_cplx_for_(cpp11::complexes x);
+extern "C" SEXP _cpp11test_sum_cplx_for_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
+  END_CPP11
+}
+// sum.cpp
+cpp11::complexes sum_cplx_for_2_(cpp11::complexes x);
+extern "C" SEXP _cpp11test_sum_cplx_for_2_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for_2_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
+  END_CPP11
+}
+// sum.cpp
+std::complex<double> sum_cplx_for_3_(cpp11::complexes x_sxp);
+extern "C" SEXP _cpp11test_sum_cplx_for_3_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for_3_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+std::complex<double> sum_cplx_for_4_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_cplx_for_4_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for_4_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+SEXP sum_cplx_for_5_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_cplx_for_5_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for_5_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+cpp11::complexes sum_cplx_for_6_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_cplx_for_6_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for_6_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
+  END_CPP11
+}
+// sum.cpp
+std::complex<double> sum_cplx_foreach_(cpp11::complexes x);
+extern "C" SEXP _cpp11test_sum_cplx_foreach_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_foreach_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
+  END_CPP11
+}
+// sum.cpp
+std::complex<double> sum_cplx_accumulate_(cpp11::complexes x);
+extern "C" SEXP _cpp11test_sum_cplx_accumulate_(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_accumulate_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
+  END_CPP11
+}
+// sum.cpp
+std::complex<double> sum_cplx_for2_(SEXP x_sxp);
+extern "C" SEXP _cpp11test_sum_cplx_for2_(SEXP x_sxp) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(sum_cplx_for2_(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) {
@@ -488,6 +558,7 @@ 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_cplx_",               (DL_FUNC) &_cpp11test_grow_cplx_,               1},
     {"_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},
@@ -520,6 +591,15 @@ static const R_CallMethodDef CallEntries[] = {
     {"_cpp11test_row_sums",                 (DL_FUNC) &_cpp11test_row_sums,                 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_cplx_accumulate_",     (DL_FUNC) &_cpp11test_sum_cplx_accumulate_,     1},
+    {"_cpp11test_sum_cplx_for2_",           (DL_FUNC) &_cpp11test_sum_cplx_for2_,           1},
+    {"_cpp11test_sum_cplx_for_",            (DL_FUNC) &_cpp11test_sum_cplx_for_,            1},
+    {"_cpp11test_sum_cplx_for_2_",          (DL_FUNC) &_cpp11test_sum_cplx_for_2_,          1},
+    {"_cpp11test_sum_cplx_for_3_",          (DL_FUNC) &_cpp11test_sum_cplx_for_3_,          1},
+    {"_cpp11test_sum_cplx_for_4_",          (DL_FUNC) &_cpp11test_sum_cplx_for_4_,          1},
+    {"_cpp11test_sum_cplx_for_5_",          (DL_FUNC) &_cpp11test_sum_cplx_for_5_,          1},
+    {"_cpp11test_sum_cplx_for_6_",          (DL_FUNC) &_cpp11test_sum_cplx_for_6_,          1},
+    {"_cpp11test_sum_cplx_foreach_",        (DL_FUNC) &_cpp11test_sum_cplx_foreach_,        1},
     {"_cpp11test_sum_dbl_accumulate2_",     (DL_FUNC) &_cpp11test_sum_dbl_accumulate2_,     1},
     {"_cpp11test_sum_dbl_accumulate_",      (DL_FUNC) &_cpp11test_sum_dbl_accumulate_,      1},
     {"_cpp11test_sum_dbl_for2_",            (DL_FUNC) &_cpp11test_sum_dbl_for2_,            1},

cpp11test/man/roxcpp3_.Rd

@@ -1,3 +1,4 @@
+#include "cpp11/complexes.hpp"
 #include "cpp11/doubles.hpp"
 
 [[cpp11::register]] cpp11::writable::doubles grow_(R_xlen_t n) {
@@ -9,3 +10,14 @@
 
   return x;
 }
+
+[[cpp11::register]] cpp11::writable::complexes grow_cplx_(R_xlen_t n) {
+  cpp11::writable::complexes x;
+  R_xlen_t i = 0;
+  while (i < n) {
+    x.push_back(std::complex<double>(i, i));
+    i++;
+  }
+
+  return x;
+}