Test both Rcpp_eval() and Rcpp_fast_eval()

Author: lionel-

ChangeLog

@@ -7,6 +7,9 @@
         functions are still caught and dealt with properly by the client
         package.
 
+        * inst/unitTests/runit.interface.R: Test both Rcpp_eval() and
+        Rcpp_fast_eval().
+
 2018-06-01  Lionel Henry  <lionel@rstudio.com>
 
         * inst/unitTests/runit.interface.R: New tests for interfaces and unwind.

inst/unitTests/testRcppInterfaceExporter/src/exporter.cpp

@@ -7,7 +7,11 @@
 
 //' @export
 // [[Rcpp::export]]
-SEXP test_cpp_interface(SEXP x) {
+SEXP test_cpp_interface(SEXP x, bool fast = false) {
   unwound_t stack_obj("cpp_interface_upstream");
-  return Rcpp::Rcpp_fast_eval(x, R_GlobalEnv);
+  if (fast) {
+      return Rcpp::Rcpp_fast_eval(x, R_GlobalEnv);
+  } else {
+      return Rcpp::Rcpp_eval(x, R_GlobalEnv);
+  }
 }

inst/unitTests/testRcppInterfaceUser/src/user.cpp

@@ -8,9 +8,9 @@
 
 //' @export
 // [[Rcpp::export]]
-SEXP use_cpp_interface(SEXP x) {
+SEXP use_cpp_interface(SEXP x, bool fast = false) {
   unwound_t stack_obj("cpp_interface_downstream");
-  Rcpp::RObject out = testRcppInterfaceExporter::test_cpp_interface(x);
+  Rcpp::RObject out = testRcppInterfaceExporter::test_cpp_interface(x, fast);
   Rcpp::Rcout << "Wrapping up" << std::endl;
   return out;
 }

inst/unitTests/testRcppInterfaceUser/tests/tests.R

@@ -1,22 +1,39 @@
 
+reset <- function() {
+    testRcppInterfaceUser::reset_flags()
+    testRcppInterfaceExporter::reset_flags()
+}
+
+
 # This tests errors converted to exceptions by Rcpp_eval()
 x <- tryCatch(
   error = identity,
   testRcppInterfaceUser::use_cpp_interface(quote(stop("jump!")))
 )
 
-stopifnot(grepl("jump!", x$message))
+stopifnot(
+    grepl("jump!", x$message),
+    testRcppInterfaceUser::peek_flag("cpp_interface_downstream"),
+    testRcppInterfaceExporter::peek_flag("cpp_interface_upstream")
+)
 
-if (getRversion() >= "3.5.0") {
-    stopifnot(
-        testRcppInterfaceUser::peek_flag("cpp_interface_downstream"),
-        testRcppInterfaceExporter::peek_flag("cpp_interface_upstream")
-    )
-}
+
+reset()
+
+# This tests errors converted to resumable longjumps by Rcpp_fast_eval()
+x <- tryCatch(
+  error = identity,
+  testRcppInterfaceUser::use_cpp_interface(quote(stop("jump!")), fast = TRUE)
+)
+
+stopifnot(
+    grepl("jump!", x$message),
+    testRcppInterfaceUser::peek_flag("cpp_interface_downstream"),
+    testRcppInterfaceExporter::peek_flag("cpp_interface_upstream")
+)
 
 
-testRcppInterfaceUser::reset_flags()
-testRcppInterfaceExporter::reset_flags()
+reset()
 
 # This tests longjumps not caught by Rcpp_eval()
 x <- withRestarts(