check Clang/GCC and CXX11/14/17/20/23 combinations locally

Author: pachadotdev

.gitignore

@@ -26,3 +26,4 @@ benchmarks/Rcppbenchmark/src/Makevars
 benchmarks/cpp4rbenchmark/src/Makevars
 benchmarks/cpp11benchmark/src/Makevars
 benchmarks/bench_data.rds
+cpp4rtest_0.1.0.tar.gz

DESCRIPTION

@@ -20,8 +20,6 @@ BugReports: https://github.com/pachadotdev/cpp4r/issues
 Depends:
     R (>= 4.0.0)
 Imports: 
-    brio,
-    cli,
     decor,
     desc,
     glue,
@@ -34,7 +32,6 @@ Suggests:
     mockery,
     roxygen2,
     testthat (>= 3.2.0)
-Config/Needs/cpp4r/register: brio, cli, decor, desc, glue, tibble, vctrs
 Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

R/register.R

@@ -7,9 +7,6 @@
 #' Note registered functions will not be *exported* from your package unless
 #' you also add a `@export` roxygen2 directive for them.
 #'
-#' In order to use `register()` the `cli`, `decor`, `desc`, `glue`,
-#' `tibble` and `vctrs` packages must also be installed.
-#' 
 #' @param path The path to the package root directory. The default is `NULL`,
 #' @param quiet If `TRUE` suppresses output from this function
 #' @param extension The file extension to use for the generated src/cpp4r file.
@@ -40,7 +37,6 @@
 register <- function(path = NULL, quiet = !is_interactive(), extension = c(".cpp", ".cc")) {
   stopifnot(!is.null(path), dir.exists(path))
 
-  stop_unless_installed(get_register_needs())
   extension <- match.arg(extension)
 
   r_path <- file.path(path, "R", "cpp4r.R")
@@ -70,13 +66,13 @@ register <- function(path = NULL, quiet = !is_interactive(), extension = c(".cpp
 
   dir.create(dirname(r_path), recursive = TRUE, showWarnings = FALSE)
 
-  brio::write_lines(path = r_path, glue::glue("
+  writeLines(text = glue::glue("
       # Generated by cpp4r: do not edit by hand
 
       {r_functions}
-      "))
+      "), con = r_path)
   if (!quiet) {
-    cli::cli_alert_success("generated file {.file {basename(r_path)}}")
+    message(" Generated file '", basename(r_path), "'")
   }
 
   call_entries <- get_call_entries(path, funs$name, package)
@@ -107,7 +103,7 @@ register <- function(path = NULL, quiet = !is_interactive(), extension = c(".cpp
 
   extra_includes <- paste0(extra_includes, collapse = "\n")
 
-  brio::write_lines(path = cpp_path, glue::glue('
+  writeLines(text = glue::glue('
       // Generated by cpp4r: do not edit by hand
       // clang-format off
 
@@ -128,10 +124,10 @@ register <- function(path = NULL, quiet = !is_interactive(), extension = c(".cpp
       }}
       ',
     call_entries = glue::glue_collapse(call_entries, "\n")
-  ))
+  ), con = cpp_path)
 
   if (!quiet) {
-    cli::cli_alert_success("generated file {.file {basename(cpp_path)}}")
+    message(" Generated file '", basename(cpp_path), "'")
   }
 
   invisible(c(r_path, cpp_path))
@@ -154,7 +150,7 @@ get_registered_functions <- function(decorations, tag, quiet = !is_interactive()
   n <- nrow(out)
 
   if (!quiet && n > 0) {
-    cli::cli_alert_info(glue::glue("{n} functions decorated with [[{tag}]]"))
+    message("i ", n, " functions decorated with [[", tag, "]]")
   }
 
   out
@@ -474,11 +470,6 @@ get_call_entries <- function(path, names, package) {
   res[seq(mid, end)]
 }
 
-get_register_needs <- function() {
-  res <- read.dcf(system.file("DESCRIPTION", package = "cpp4r"))[, "Config/Needs/cpp4r/register"]
-  strsplit(res, "[[:space:]]*,[[:space:]]*")[[1]]
-}
-
 check_valid_attributes <- function(decorations, file = decorations$file) {
   bad_decor <- startsWith(decorations$decoration, "cpp4r::") &
     (!decorations$decoration %in% c("cpp4r::register", "cpp4r::init", "cpp4r::linking_to"))

cpp4rtest/src/test-complex.h

@@ -10,14 +10,14 @@ context("complexes-C++") {
 
   test_that("complexes::r_vector::const_iterator()") {
     cpp4r::complexes x(Rf_allocVector(CPLXSXP, 100));
-    COMPLEX(x)[0] = {1, 1};
-    COMPLEX(x)[1] = {2, 2};
-    COMPLEX(x)[2] = {3, 3};
-    COMPLEX(x)[3] = {4, 4};
-    COMPLEX(x)[4] = {5, 5};
-    COMPLEX(x)[97] = {98, 98};
-    COMPLEX(x)[98] = {99, 99};
-    COMPLEX(x)[99] = {100, 100};
+    COMPLEX(x)[0] = {{1, 1}};
+    COMPLEX(x)[1] = {{2, 2}};
+    COMPLEX(x)[2] = {{3, 3}};
+    COMPLEX(x)[3] = {{4, 4}};
+    COMPLEX(x)[4] = {{5, 5}};
+    COMPLEX(x)[97] = {{98, 98}};
+    COMPLEX(x)[98] = {{99, 99}};
+    COMPLEX(x)[99] = {{100, 100}};
     expect_true(x.size() == 100);
 
     auto it = x.begin();
@@ -179,13 +179,13 @@ context("complexes-C++") {
   }
 
   test_that("writable::complexes(SEXP)") {
-    Rcomplex one{1, 1};
-    Rcomplex two{2, 2};
-    Rcomplex three{3, 3};
-    Rcomplex four{4, 4};
-    Rcomplex five{5, 5};
-    Rcomplex six{6, 6};
-    Rcomplex seven{7, 7};
+    Rcomplex one{{1, 1}};
+    Rcomplex two{{2, 2}};
+    Rcomplex three{{3, 3}};
+    Rcomplex four{{4, 4}};
+    Rcomplex five{{5, 5}};
+    Rcomplex six{{6, 6}};
+    Rcomplex seven{{7, 7}};
 
     SEXP x = PROTECT(Rf_allocVector(CPLXSXP, 5));
 
@@ -217,7 +217,7 @@ context("complexes-C++") {
     UNPROTECT(1);
   }
   test_that("writable::complexes(SEXP, bool)") {
-    Rcomplex five{5, 5};
+    Rcomplex five{{5, 5}};
     SEXP x = PROTECT(Rf_ScalarComplex(five));
     cpp4r::writable::complexes y(x, false);
 
@@ -292,8 +292,8 @@ context("complexes-C++") {
 
   test_that("complexes::attr") {
     cpp4r::complexes x(PROTECT(Rf_allocVector(CPLXSXP, 2)));
-    COMPLEX(x)[0] = {1, 1};
-    COMPLEX(x)[1] = {2, 2};
+    COMPLEX(x)[0] = {{1, 1}};
+    COMPLEX(x)[1] = {{2, 2}};
 
     SEXP foo = Rf_install("foo");
     Rf_setAttrib(x, foo, Rf_mkString("bar"));
@@ -360,16 +360,16 @@ context("complexes-C++") {
     cpp4r::complexes diff_length(Rf_allocVector(CPLXSXP, 1));
     cpp4r::complexes diff_values(Rf_allocVector(CPLXSXP, 2));
 
-    COMPLEX(base)[0] = {1, 1};
-    COMPLEX(base)[1] = {2, 2};
+    COMPLEX(base)[0] = {{1, 1}};
+    COMPLEX(base)[1] = {{2, 2}};
 
-    COMPLEX(same_values)[0] = {1, 1};
-    COMPLEX(same_values)[1] = {2, 2};
+    COMPLEX(same_values)[0] = {{1, 1}};
+    COMPLEX(same_values)[1] = {{2, 2}};
 
-    COMPLEX(diff_length)[0] = {1, 1};
+    COMPLEX(diff_length)[0] = {{1, 1}};
 
-    COMPLEX(diff_values)[0] = {1, 1};
-    COMPLEX(diff_values)[1] = {3, 3};
+    COMPLEX(diff_values)[0] = {{1, 1}};
+    COMPLEX(diff_values)[1] = {{3, 3}};
 
     expect_true(base == base);
     expect_true(base == same_values);

cpp4rtest/src/test-r_complex.h

@@ -26,7 +26,7 @@ context("r_complex-C++") {
   }
 
   test_that("explicit construction from Rcomplex") {
-    Rcomplex x{1, 2};
+    Rcomplex x{{1, 2}};
     cpp4r::r_complex y(x);
     expect_true(y.real() == x.r);
     expect_true(y.imag() == x.i);