From 6895dcddf5017a6bbb45c1b48742c841945db7d9 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sun, 23 Feb 2020 10:58:01 -0600 Subject: [PATCH 1/3] one more nocov block, some nocov whitespace realignment --- src/api.cpp | 76 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/api.cpp b/src/api.cpp index cb6299161..55f686629 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -2,7 +2,7 @@ // // api.cpp: Rcpp R/C++ interface class library -- Rcpp api // -// Copyright (C) 2012 - 2019 Dirk Eddelbuettel and Romain Francois +// Copyright (C) 2012 - 2020 Dirk Eddelbuettel and Romain Francois // // This file is part of Rcpp. // @@ -53,7 +53,7 @@ namespace Rcpp { } // [[Rcpp::register]] - unsigned long beginSuspendRNGSynchronization() {// #nocov start + unsigned long beginSuspendRNGSynchronization() { // #nocov start ++rngSynchronizationSuspended; return rngSynchronizationSuspended; } @@ -62,7 +62,7 @@ namespace Rcpp { unsigned long endSuspendRNGSynchronization() { --rngSynchronizationSuspended; return rngSynchronizationSuspended; - } // #nocov end + } // #nocov end // [[Rcpp::register]] char* get_string_buffer() { @@ -73,36 +73,36 @@ namespace Rcpp { } // [[Rcpp::register]] - const char * type2name(SEXP x) { // #nocov start + const char * type2name(SEXP x) { // #nocov start switch (TYPEOF(x)) { - case NILSXP: return "NILSXP"; - case SYMSXP: return "SYMSXP"; - case RAWSXP: return "RAWSXP"; - case LISTSXP: return "LISTSXP"; - case CLOSXP: return "CLOSXP"; - case ENVSXP: return "ENVSXP"; - case PROMSXP: return "PROMSXP"; - case LANGSXP: return "LANGSXP"; - case SPECIALSXP: return "SPECIALSXP"; - case BUILTINSXP: return "BUILTINSXP"; - case CHARSXP: return "CHARSXP"; - case LGLSXP: return "LGLSXP"; - case INTSXP: return "INTSXP"; - case REALSXP: return "REALSXP"; - case CPLXSXP: return "CPLXSXP"; - case STRSXP: return "STRSXP"; - case DOTSXP: return "DOTSXP"; - case ANYSXP: return "ANYSXP"; - case VECSXP: return "VECSXP"; - case EXPRSXP: return "EXPRSXP"; - case BCODESXP: return "BCODESXP"; - case EXTPTRSXP: return "EXTPTRSXP"; - case WEAKREFSXP: return "WEAKREFSXP"; - case S4SXP: return "S4SXP"; + case NILSXP: return "NILSXP"; + case SYMSXP: return "SYMSXP"; + case RAWSXP: return "RAWSXP"; + case LISTSXP: return "LISTSXP"; + case CLOSXP: return "CLOSXP"; + case ENVSXP: return "ENVSXP"; + case PROMSXP: return "PROMSXP"; + case LANGSXP: return "LANGSXP"; + case SPECIALSXP: return "SPECIALSXP"; + case BUILTINSXP: return "BUILTINSXP"; + case CHARSXP: return "CHARSXP"; + case LGLSXP: return "LGLSXP"; + case INTSXP: return "INTSXP"; + case REALSXP: return "REALSXP"; + case CPLXSXP: return "CPLXSXP"; + case STRSXP: return "STRSXP"; + case DOTSXP: return "DOTSXP"; + case ANYSXP: return "ANYSXP"; + case VECSXP: return "VECSXP"; + case EXPRSXP: return "EXPRSXP"; + case BCODESXP: return "BCODESXP"; + case EXTPTRSXP: return "EXTPTRSXP"; + case WEAKREFSXP: return "WEAKREFSXP"; + case S4SXP: return "S4SXP"; default: return ""; } - } // #nocov end + } // #nocov end } // namespace Rcpp @@ -127,21 +127,21 @@ std::string demangle(const std::string& name) { } // [[Rcpp::register]] -const char* short_file_name(const char* file) { // #nocov start +const char* short_file_name(const char* file) { // #nocov start std::string f(file); size_t index = f.find("/include/"); if (index != std::string::npos) { f = f.substr(index + 9); } return f.c_str(); -} // #nocov end +} // [[Rcpp::internal]] -SEXP as_character_externalptr(SEXP xp) { // #nocov start +SEXP as_character_externalptr(SEXP xp) { char buffer[20]; snprintf(buffer, 20, "%p", (void*)EXTPTR_PTR(xp)); return Rcpp::wrap((const char*)buffer); -} // #nocov end +} // #nocov end // [[Rcpp::internal]] SEXP rcpp_capabilities() { @@ -232,29 +232,29 @@ SEXP rcpp_capabilities() { // [[Rcpp::internal]] -SEXP rcpp_can_use_cxx0x() { // #nocov start +SEXP rcpp_can_use_cxx0x() { // #nocov start #if defined(HAS_VARIADIC_TEMPLATES) || defined(RCPP_USING_CXX11) return Rf_ScalarLogical(TRUE); #else return Rf_ScalarLogical(FALSE); #endif -} // #nocov end +} // [[Rcpp::internal]] -SEXP rcpp_can_use_cxx11() { // #nocov start +SEXP rcpp_can_use_cxx11() { #if defined(RCPP_USING_CXX11) return Rf_ScalarLogical(TRUE); #else return Rf_ScalarLogical(FALSE); #endif -} // #nocov end +} // [[Rcpp::register]] SEXP stack_trace(const char* file, int line) { return R_NilValue; -} +} // #nocov end // // [ [ Rcpp::register ] ] From f3b9cd8f280c1e17bb70244c80473366c2145502 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sun, 23 Feb 2020 11:01:11 -0600 Subject: [PATCH 2/3] add nocov tags --- inst/include/Rcpp/exceptions_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/include/Rcpp/exceptions_impl.h b/inst/include/Rcpp/exceptions_impl.h index 2a3244537..9c8e044af 100644 --- a/inst/include/Rcpp/exceptions_impl.h +++ b/inst/include/Rcpp/exceptions_impl.h @@ -26,7 +26,7 @@ namespace Rcpp { #include // Extract mangled name e.g. ./test(baz+0x14)[0x400962] - static std::string demangler_one(const char* input) { + static std::string demangler_one(const char* input) { // #nocov start static std::string buffer; buffer = input; size_t last_open = buffer.find_last_of('('); @@ -84,6 +84,6 @@ namespace Rcpp { _["line" ] = -1, _["stack"] = res); trace.attr("class") = "Rcpp_stack_trace"; - rcpp_set_stack_trace(trace); + rcpp_set_stack_trace(trace); // #nocov end } }; From f77a4e7228a591114544662ede060a659a17e71a Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sun, 23 Feb 2020 11:26:27 -0600 Subject: [PATCH 3/3] add nocov tags --- inst/include/Rcpp/generated/Vector__create.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/inst/include/Rcpp/generated/Vector__create.h b/inst/include/Rcpp/generated/Vector__create.h index a1d08e595..66bccdfb5 100644 --- a/inst/include/Rcpp/generated/Vector__create.h +++ b/inst/include/Rcpp/generated/Vector__create.h @@ -173,21 +173,21 @@ } template - static Vector create__dispatch( traits::true_type, const T1& t1, const T2& t2, const T3& t3){ - Vector res( 3 ) ; - Shield names( ::Rf_allocVector( STRSXP, 3 ) ) ; - int index = 0 ; - iterator it( res.begin() ); + static Vector create__dispatch( traits::true_type, const T1& t1, const T2& t2, const T3& t3){ // #nocov start + Vector res( 3 ) ; + Shield names( ::Rf_allocVector( STRSXP, 3 ) ) ; + int index = 0 ; + iterator it( res.begin() ); - //// + //// replace_element( it, names, index, t1 ) ; ++it; ++index ; replace_element( it, names, index, t2 ) ; ++it; ++index ; replace_element( it, names, index, t3 ) ; ++it; ++index ; - //// + //// - res.attr("names") = names ; + res.attr("names") = names ; - return res ; + return res ; // #nocov end } public: