Tidy up and use Rcpp_IsNA, Rcpp_IsNaN where possible

Author: kevinushey

inst/include/Rcpp/traits/NAComparator.h renamed to inst/include/Rcpp/NAComparator.h

@@ -20,11 +20,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef Rcpp__traits__NAComparator__h
-#define Rcpp__traits__NAComparator__h
+#ifndef Rcpp__NAComparator__h
+#define Rcpp__NAComparator__h
 
 namespace Rcpp{
-namespace traits{
 
 inline bool Rcpp_IsNA(double x) {
   return memcmp(
@@ -93,7 +92,6 @@ struct NAComparator<SEXP> {
   }
 };
 
-}
 }     
 
 #endif

inst/include/Rcpp/traits/NAEquals.h renamed to inst/include/Rcpp/NAEquals.h

@@ -17,13 +17,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef Rcpp__traits__NAEquals__h
-#define Rcpp__traits__NAEquals__h
+#ifndef Rcpp__NAEquals__h
+#define Rcpp__NAEquals__h
 
 namespace Rcpp {
 
-namespace traits {
-  
 template <typename T>
 struct NAEquals {
   inline bool operator()(T left, T right) const {
@@ -40,6 +38,4 @@ struct NAEquals<double> {
 
 }
 
-}
-
 #endif

inst/include/Rcpp/hash/IndexHash.h

@@ -160,7 +160,7 @@ namespace Rcpp{
         }
 
         inline bool not_equal(const STORAGE& lhs, const STORAGE& rhs) {
-            return ! ::Rcpp::traits::NAEquals<STORAGE>()(lhs, rhs);
+            return ! NAEquals<STORAGE>()(lhs, rhs);
         }
 
         bool add_value(int i){
@@ -213,8 +213,8 @@ namespace Rcpp{
       union dint_u val_u;
       /* double is a bit tricky - we nave to normalize 0.0, NA and NaN */
       if (val == 0.0) val = 0.0;
-      if (R_IsNA(val)) val = NA_REAL;
-      else if (R_IsNaN(val)) val = R_NaN;
+      if (Rcpp_IsNA(val)) val = NA_REAL;
+      else if (Rcpp_IsNaN(val)) val = R_NaN;
       val_u.d = val;
       addr = RCPP_HASH(val_u.u[0] + val_u.u[1]);
       return addr ;

inst/include/Rcpp/hash/SelfHash.h

@@ -104,8 +104,8 @@ namespace sugar{
       union dint_u val_u;
       /* double is a bit tricky - we nave to normalize 0.0, NA and NaN */
       if (val == 0.0) val = 0.0;
-      if (R_IsNA(val)) val = NA_REAL;
-      else if (R_IsNaN(val)) val = R_NaN;
+      if (Rcpp_IsNA(val)) val = NA_REAL;
+      else if (Rcpp_IsNaN(val)) val = R_NaN;
       val_u.d = val;            
       addr = RCPP_HASH(val_u.u[0] + val_u.u[1]);
       return addr ;

inst/include/Rcpp/internal/r_coerce.h

@@ -52,7 +52,7 @@ inline int r_coerce<LGLSXP,INTSXP>(int from){
 }
 template <> 
 inline int r_coerce<REALSXP,INTSXP>(double from){
-	if (R_IsNA(from)) {
+	if (Rcpp_IsNA(from)) {
 		return NA_INTEGER;
 	} else if (from > INT_MAX || from <= INT_MIN ) {
 		return NA_INTEGER;
@@ -90,7 +90,7 @@ inline double r_coerce<RAWSXP,REALSXP>(Rbyte from){
 // -> LGLSXP
 template <> 
 inline int r_coerce<REALSXP,LGLSXP>(double from){
-	return R_IsNA(from) ? NA_LOGICAL : (from!=0.0);	
+	return Rcpp_IsNA(from) ? NA_LOGICAL : (from!=0.0);	
 }
 
 template <> 
@@ -100,7 +100,7 @@ inline int r_coerce<INTSXP,LGLSXP>(int from){
 
 template <>
 inline int r_coerce<CPLXSXP,LGLSXP>(Rcomplex from){
-	if( R_IsNA(from.r) ) return NA_LOGICAL ;
+	if( Rcpp_IsNA(from.r) ) return NA_LOGICAL ;
 	if( from.r == 0.0 || from.i == 0.0 ) return FALSE ;
 	return TRUE ;
 }
@@ -119,7 +119,7 @@ inline Rbyte r_coerce<INTSXP,RAWSXP>(int from){
 
 template <> 
 inline Rbyte r_coerce<REALSXP,RAWSXP>(double from){
-	if( R_IsNA(from) ) return static_cast<Rbyte>(0) ; 
+	if( Rcpp_IsNA(from) ) return static_cast<Rbyte>(0) ; 
 	return r_coerce<INTSXP,RAWSXP>(static_cast<int>(from)) ;
 }
 
@@ -137,7 +137,7 @@ inline Rbyte r_coerce<LGLSXP,RAWSXP>(int from){
 template <> 
 inline Rcomplex r_coerce<REALSXP,CPLXSXP>(double from){
 	Rcomplex c ;
-	if( R_IsNA(from) ){
+	if( Rcpp_IsNA(from) ){
 		c.r = NA_REAL; 
 		c.i = NA_REAL;
 	} else{
@@ -273,7 +273,7 @@ template <>
 inline SEXP r_coerce<REALSXP,STRSXP>(double from){
 
   // handle some special values explicitly
-  if (R_IsNaN(from)) return Rf_mkChar("NaN");
+  if (Rcpp_IsNaN(from)) return Rf_mkChar("NaN");
   else if (from == R_PosInf) return Rf_mkChar("Inf");
   else if (from == R_NegInf) return Rf_mkChar("-Inf");
   else return Rcpp::traits::is_na<REALSXP>(from) ? NA_STRING :Rf_mkChar( coerce_to_string<REALSXP>( from ) ) ;

inst/include/Rcpp/sugar/functions/table.h

@@ -113,7 +113,7 @@ class Table {
     typedef CountInserter<HASH,STORAGE> Inserter ;
     HASH hash ;
 
-    typedef std::map<STORAGE, int, ::Rcpp::traits::NAComparator<STORAGE> > SORTED_MAP ;
+    typedef std::map<STORAGE, int, NAComparator<STORAGE> > SORTED_MAP ;
     SORTED_MAP map ;
 
 }; 

inst/include/Rcpp/traits/is_na.h

@@ -39,12 +39,12 @@ namespace Rcpp{
 
         template <> 
         inline bool is_na<REALSXP>(double x) {
-            return R_IsNA(x) || R_IsNaN(x);
+            return Rcpp_IsNA(x) || Rcpp_IsNaN(x);
         }
 
         template <> 
         inline bool is_na<CPLXSXP>(Rcomplex x) {
-            return R_IsNA(x.r) || R_IsNA(x.i) || R_IsNaN(x.r) || R_IsNaN(x.i);
+            return Rcpp_IsNA(x.r) || Rcpp_IsNA(x.i) || Rcpp_IsNaN(x.r) || Rcpp_IsNaN(x.i);
         }
 
         template <>

inst/include/Rcpp/traits/is_nan.h

@@ -33,12 +33,12 @@ namespace traits{
 
 	template <> 
 	inline bool is_nan<REALSXP>( double x ){
-		return R_IsNaN(x) ;
+		return Rcpp_IsNaN(x) ;
 	}
 
 	template <> 
 	inline bool is_nan<CPLXSXP>( Rcomplex x ){
-		return R_IsNaN(x.r) || R_IsNaN(x.i) ;
+		return Rcpp_IsNaN(x.r) || Rcpp_IsNaN(x.i) ;
 	}
 
 }

inst/include/Rcpp/traits/traits.h

@@ -38,8 +38,6 @@
 #include <Rcpp/traits/storage_type.h>
 #include <Rcpp/traits/r_sexptype_traits.h>
 #include <Rcpp/traits/storage_type.h>
-#include <Rcpp/traits/NAComparator.h>
-#include <Rcpp/traits/NAEquals.h>
 #include <Rcpp/traits/r_type_traits.h>
 #include <Rcpp/traits/un_pointer.h>
 #include <Rcpp/traits/is_pointer.h>

inst/include/Rcpp/vector/Vector.h

@@ -247,7 +247,7 @@ class Vector :
         std::sort( 
             start, 
             start + size(), 
-            typename traits::NAComparator<typename traits::storage_type<RTYPE>::type >()
+            NAComparator<typename traits::storage_type<RTYPE>::type >()
         ) ;
         return *this ;
     }