Need a specialized 'equals' to handle NA, NaN in Hasher

Author: kevinushey

inst/include/Rcpp/hash/IndexHash.h

@@ -159,8 +159,8 @@ namespace Rcpp{
         #endif
         }
 
-        inline bool not_equal(STORAGE lhs, STORAGE rhs) {
-          return ::Rcpp::traits::comparator_type<STORAGE>()(lhs, rhs);
+        inline bool not_equal(const STORAGE& lhs, const STORAGE& rhs) {
+            return ! ::Rcpp::traits::equal_type<STORAGE>()(lhs, rhs);
         }
 
         bool add_value(int i){
@@ -169,15 +169,17 @@ namespace Rcpp{
             int addr = get_addr(val) ;
             while (data[addr] && not_equal( src[data[addr] - 1], val)) {
               addr++;
-              if (addr == m) addr = 0;
+              if (addr == m) {
+                addr = 0;
+              }
             }
+            
             if (!data[addr]){
               data[addr] = i ;
               size_++ ;
 
               return true ;
             }
-            
             return false;
         }
 

inst/include/Rcpp/traits/comparator_type.h

@@ -46,7 +46,7 @@ inline int StrCmp(SEXP x, SEXP y) {
     if (x == NA_STRING) return (y == NA_STRING ? 0 : 1);
     if (y == NA_STRING) return -1;
     if (x == y) return 0;  // same string in cache
-    return strcmp(CHAR(x), CHAR(y));
+    return strcmp(char_nocheck(x), char_nocheck(y));
 }
 
 template <typename T>
@@ -91,7 +91,21 @@ struct comparator_type<SEXP> {
   inline bool operator()(SEXP left, SEXP right) const {
     return StrCmp(left, right) < 0;
   }
-};   
+};
+
+template <typename T>
+struct equal_type {
+  inline bool operator()(T left, T right) const {
+    return left == right;
+  }
+};
+
+template <>
+struct equal_type<double> {
+  inline bool operator()(double left, double right) const {
+    return memcmp(&left, &right, sizeof(double)) == 0;
+  }
+};
 
 }
 }