.github/workflows/test-coverage.yaml

@@ -35,7 +35,7 @@ jobs:
         run: |
           install.packages(c("remotes"))
           remotes::install_deps(dependencies = TRUE)
-          remotes::install_cran("covr")
+          remotes::install_cran("r-lib/covr")
         shell: Rscript {0}
 
       - name: Test coverage

DESCRIPTION

@@ -48,10 +48,14 @@ Suggests:
     readr,
     testthat (>= 2.1.0)
 LinkingTo: 
-    Rcpp
+    cpp11
 VignetteBuilder: 
     knitr
+SystemRequirements: C++11
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.1.0
+Remotes:
+  r-lib/cpp11,
+  rstudio/rmarkdown

R/cpp11-exports.R

@@ -0,0 +1,19 @@
+# Generated by cpp11: do not edit by hand
+
+fillDown <- function(x){
+  .Call("_tidyr_fillDown" , x)
+}
+
+fillUp <- function(x){
+  .Call("_tidyr_fillUp" , x)
+}
+
+melt_dataframe <- function(data, id_ind, measure_ind, variable_name, value_name, attrTemplate, factorsAsStrings, valueAsFactor, variableAsFactor){
+  .Call("_tidyr_melt_dataframe" , data, id_ind, measure_ind, variable_name, value_name, attrTemplate, factorsAsStrings, valueAsFactor, variableAsFactor)
+}
+
+simplifyPieces <- function(pieces, p, fillLeft){
+  .Call("_tidyr_simplifyPieces" , pieces, p, fillLeft)
+}
+
+

R/fill.R

@@ -1,6 +1,3 @@
-#' @importFrom Rcpp sourceCpp
-NULL
-
 #' Fill in missing values with previous or next value
 #'
 #' Fills missing values in selected columns using the next or previous entry.

src/cpp11-exports.cpp

@@ -0,0 +1,58 @@
+// Generated by cpp11: do not edit by hand
+
+#include "cpp11/declarations.hpp"
+
+
+// fill.cpp
+SEXP fillDown(SEXP x);
+extern "C" SEXP _tidyr_fillDown(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(fillDown(cpp11::unmove(cpp11::as_cpp<SEXP>(x))));
+  END_CPP11
+}
+// fill.cpp
+SEXP fillUp(SEXP x);
+extern "C" SEXP _tidyr_fillUp(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(fillUp(cpp11::unmove(cpp11::as_cpp<SEXP>(x))));
+  END_CPP11
+}
+// melt.cpp
+cpp11::list melt_dataframe(cpp11::data_frame data, const cpp11::integers& id_ind, const cpp11::integers& measure_ind, cpp11::strings variable_name, cpp11::strings value_name, cpp11::sexp attrTemplate, bool factorsAsStrings, bool valueAsFactor, bool variableAsFactor);
+extern "C" SEXP _tidyr_melt_dataframe(SEXP data, SEXP id_ind, SEXP measure_ind, SEXP variable_name, SEXP value_name, SEXP attrTemplate, SEXP factorsAsStrings, SEXP valueAsFactor, SEXP variableAsFactor) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(melt_dataframe(cpp11::unmove(cpp11::as_cpp<cpp11::data_frame>(data)), cpp11::unmove(cpp11::as_cpp<const cpp11::integers&>(id_ind)), cpp11::unmove(cpp11::as_cpp<const cpp11::integers&>(measure_ind)), cpp11::unmove(cpp11::as_cpp<cpp11::strings>(variable_name)), cpp11::unmove(cpp11::as_cpp<cpp11::strings>(value_name)), cpp11::unmove(cpp11::as_cpp<cpp11::sexp>(attrTemplate)), cpp11::unmove(cpp11::as_cpp<bool>(factorsAsStrings)), cpp11::unmove(cpp11::as_cpp<bool>(valueAsFactor)), cpp11::unmove(cpp11::as_cpp<bool>(variableAsFactor))));
+  END_CPP11
+}
+// simplifyPieces.cpp
+cpp11::list simplifyPieces(cpp11::list pieces, int p, bool fillLeft);
+extern "C" SEXP _tidyr_simplifyPieces(SEXP pieces, SEXP p, SEXP fillLeft) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(simplifyPieces(cpp11::unmove(cpp11::as_cpp<cpp11::list>(pieces)), cpp11::unmove(cpp11::as_cpp<int>(p)), cpp11::unmove(cpp11::as_cpp<bool>(fillLeft))));
+  END_CPP11
+}
+
+extern "C" {
+/* .Call calls */
+extern SEXP _tidyr_fillDown(SEXP);
+extern SEXP _tidyr_fillUp(SEXP);
+extern SEXP _tidyr_melt_dataframe(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
+extern SEXP _tidyr_simplifyPieces(SEXP, SEXP, SEXP);
+
+static const R_CallMethodDef CallEntries[] = {
+    {"_tidyr_fillDown",       (DL_FUNC) &_tidyr_fillDown,       1},
+    {"_tidyr_fillUp",         (DL_FUNC) &_tidyr_fillUp,         1},
+    {"_tidyr_melt_dataframe", (DL_FUNC) &_tidyr_melt_dataframe, 9},
+    {"_tidyr_simplifyPieces", (DL_FUNC) &_tidyr_simplifyPieces, 3},
+    {NULL, NULL, 0}
+};
+}
+
+
+
+extern "C" void R_init_tidyr(DllInfo* dll){
+  R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
+  R_useDynamicSymbols(dll, FALSE);
+
+}
+

src/fill.cpp

@@ -1,7 +1,6 @@
-#include <Rcpp.h>
-using namespace Rcpp;
+#include "cpp11/protect.hpp"
 
-// [[Rcpp::export]]
+[[cpp11::export]]
 SEXP fillDown(SEXP x) {
   int n = Rf_length(x);
   SEXP out = Rf_allocVector(TYPEOF(x), n);
@@ -71,15 +70,15 @@ SEXP fillDown(SEXP x) {
 
   }
   default:
-    stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
+    cpp11::stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
   }
 
   Rf_copyMostAttrib(x, out);
   return out;
 }
 
 
-// [[Rcpp::export]]
+[[cpp11::export]]
 SEXP fillUp(SEXP x) {
   int n = Rf_length(x);
   SEXP out = Rf_allocVector(TYPEOF(x), n);
@@ -149,7 +148,7 @@ SEXP fillUp(SEXP x) {
 
   }
   default:
-    stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
+    cpp11::stop("Don't know how to handle column of type", Rf_type2char(TYPEOF(x)));
   }
 
   Rf_copyMostAttrib(x, out);