a few more #nocov tags

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2017-02-17  Dirk Eddelbuettel  <[email protected]>
+
+        * R/tools.R: More #nocov
+        * inst/include/Rcpp/internal/r_vector.h: Idem
+
 2017-02-15  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Version, Date): New minor version

R/tools.R

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2010 - 2017  Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -15,36 +15,36 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-externalptr_address <- function(xp){
-    .Call( as_character_externalptr, xp )
+externalptr_address <- function(xp) {
+    .Call(as_character_externalptr, xp)			# #nocov
 }
 
 # just like assignInNamespace but first checks that the binding exists
-forceAssignInNamespace <- function( x, value, env ){
-    is_ns <- isNamespace( env )
-    unlocker <- get( "unlockBinding", baseenv() )
-    if( is_ns && exists( x, env ) && bindingIsLocked(x, env ) ){
-        unlocker( x, env )
+forceAssignInNamespace <- function(x, value, env) {
+    is_ns <- isNamespace(env)
+    unlocker <- get("unlockBinding", baseenv())
+    if (is_ns && exists(x, env) && bindingIsLocked(x, env)) {
+        unlocker(x, env)
     }
-    assign( x, value, env )
-    if( is_ns ){
-        lockBinding( x, env )
+    assign(x, value, env)
+    if (is_ns) {
+        lockBinding(x, env)
     }
 }
 
 # Transform a path for passing to the build system on the command line.
-# Leave paths alone for posix. For Windows, mirror the behavior of the 
+# Leave paths alone for posix. For Windows, mirror the behavior of the
 # R package build system by starting with the fully resolved absolute path,
-# transforming it to a short path name if it contains spaces, and then 
+# transforming it to a short path name if it contains spaces, and then
 # converting backslashes to forward slashes
 asBuildPath <- function(path) {
-    
+
     if (.Platform$OS.type == "windows") {
-        path <- normalizePath(path)
+        path <- normalizePath(path)			# #nocov start
         if (grepl(' ', path, fixed=TRUE))
             path <- utils::shortPathName(path)
-        path <- gsub("\\\\", "/", path)
+        path <- gsub("\\\\", "/", path)			# #nocov end
     }
-    
+
     return(path)
 }

inst/include/Rcpp/internal/r_vector.h

@@ -1,9 +1,9 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 /* :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: */
 //
 // r_vector.h: Rcpp R/C++ interface class library -- information about R vectors
 //
-// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2017  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -27,63 +27,62 @@ namespace Rcpp{
 namespace internal{
 
 template <int RTYPE>
-typename Rcpp::traits::storage_type<RTYPE>::type* r_vector_start(SEXP x){
-	typedef typename Rcpp::traits::storage_type<RTYPE>::type* pointer ;
-	return reinterpret_cast<pointer>( dataptr(x) ) ;
+typename Rcpp::traits::storage_type<RTYPE>::type* r_vector_start(SEXP x) {
+    typedef typename Rcpp::traits::storage_type<RTYPE>::type* pointer;
+    return reinterpret_cast<pointer>(dataptr(x));
 }
 
 /**
  * The value 0 statically casted to the appropriate type for
  * the given SEXP type
  */
-template <int RTYPE,typename CTYPE>
-inline CTYPE get_zero(){
-	return static_cast<CTYPE>(0) ;
-}
+template <int RTYPE,typename CTYPE>				// #nocov start
+inline CTYPE get_zero() {
+    return static_cast<CTYPE>(0);
+}								// #nocov end
 
 
 /**
  * Specialization for Rcomplex
  */
 template<>
 inline Rcomplex get_zero<CPLXSXP,Rcomplex>(){
-	Rcomplex x ;
-	x.r = 0.0 ;
-	x.i = 0.0 ;
-	return x ;
+    Rcomplex x;
+    x.r = 0.0;
+    x.i = 0.0;
+    return x;
 }
 
 /**
  * Initializes a vector of the given SEXP type. The template fills the
  * vector with the value 0 of the appropriate type, for example
  * an INTSXP vector is initialized with (int)0, etc...
  */
-template<int RTYPE> void r_init_vector(SEXP x){
-	typedef typename ::Rcpp::traits::storage_type<RTYPE>::type CTYPE ;
-	CTYPE* start=r_vector_start<RTYPE>(x) ;
-	std::fill( start, start + Rf_xlength(x), get_zero<RTYPE,CTYPE>() ) ;
-}
+template<int RTYPE> void r_init_vector(SEXP x) {		// #nocov start
+    typedef typename ::Rcpp::traits::storage_type<RTYPE>::type CTYPE;
+    CTYPE* start=r_vector_start<RTYPE>(x);
+    std::fill(start, start + Rf_xlength(x), get_zero<RTYPE,CTYPE>());
+}								// #nocov end
 /**
  * Initializes a generic vector (VECSXP). Does nothing since
  * R already initializes all elements to NULL
  */
 template<>
-inline void r_init_vector<VECSXP>(SEXP /*x*/){}
+inline void r_init_vector<VECSXP>(SEXP /*x*/) {}
 
 /**
  * Initializes an expression vector (EXPRSXP). Does nothing since
  * R already initializes all elements to NULL
  */
 template<>
-inline void r_init_vector<EXPRSXP>(SEXP /*x*/){}
+inline void r_init_vector<EXPRSXP>(SEXP /*x*/) {}
 
 /**
  * Initializes a character vector (STRSXP). Does nothing since
  * R already initializes all elements to ""
  */
 template<>
-inline void r_init_vector<STRSXP>(SEXP /*x*/){}
-
+inline void r_init_vector<STRSXP>(SEXP /*x*/) {}
 
 
 /**
@@ -104,36 +103,31 @@ class Sort_is_not_allowed_for_this_type;
  * Specialization for CPLXSXP, INTSXP, LGLSXP, REALSXP, and STRSXP
  */
 template<>
-class Sort_is_not_allowed_for_this_type<CPLXSXP>
-{
+class Sort_is_not_allowed_for_this_type<CPLXSXP> {
 public:
     static void do_nothing() {}
 };
 
 template<>
-class Sort_is_not_allowed_for_this_type<INTSXP>
-{
+class Sort_is_not_allowed_for_this_type<INTSXP> {
 public:
     static void do_nothing() {}
 };
 
 template<>
-class Sort_is_not_allowed_for_this_type<LGLSXP>
-{
+class Sort_is_not_allowed_for_this_type<LGLSXP> {
 public:
     static void do_nothing() {}
 };
 
 template<>
-class Sort_is_not_allowed_for_this_type<REALSXP>
-{
+class Sort_is_not_allowed_for_this_type<REALSXP> {
 public:
     static void do_nothing() {}
 };
 
 template<>
-class Sort_is_not_allowed_for_this_type<STRSXP>
-{
+class Sort_is_not_allowed_for_this_type<STRSXP> {
 public:
     static void do_nothing() {}
 };