[snapshot]

elia · elia · commit 011b18cb9110 · 2014-10-31T19:47:37.000+01:00
diff --git a/Rakefile b/Rakefile
@@ -41,10 +41,7 @@ task :mspec_node do
 
   if pattern
     custom = Dir[pattern]
-    p custom.size
-    p rubyspecs.grep /hash/
     custom &= rubyspecs if whitelist_pattern
-    p whitelist_pattern, custom.size
     specs = add_specs.(:custom, custom)
   else
     specs = add_specs.(:shared, shared)
diff --git a/opal/corelib/hash.rb b/opal/corelib/hash.rb
@@ -35,22 +35,22 @@ def ==(other)
         return true;
       }
 
-      if (!other.keys || !other.smap || !other.smap) {
+      if (!other.keys || !other.smap || !other.map) {
         return false;
       }
 
       if (self.keys.length !== other.keys.length) {
         return false;
       }
 
-      var _map   = self.map,
-          _map2  = other.map,
+      var _map  = self.map,
           smap  = self.smap,
+          _map2 = other.map,
           smap2 = other.smap,
           map, map2, key, khash, value, value2;
 
       for (var i = 0, length = self.keys.length; i < length; i++) {
-        key   = self.keys[i];
+        key = self.keys[i];
 
         if (key.$$is_string) {
           khash = key;
@@ -63,6 +63,7 @@ def ==(other)
         }
 
         value  = map[khash];
+        if (value === undefined) console.log('==', key, self);
         value2 = map2[khash];
 
         if (value2 === undefined || #{not(`value` == `value2`)}) {
@@ -387,7 +388,17 @@ def empty?
 
   def fetch(key, defaults = undefined, &block)
     %x{
-      var hash = key.$hash(), value = self.map[hash];
+      var map, khash, value;
+
+      if (key.$$is_string) {
+        khash = key;
+        map = self.smap;
+      } else {
+        khash = key.$hash();
+        map = self.map;
+      }
+
+      value = map[khash];
 
       if (value != null) {
         return value;
@@ -520,13 +531,22 @@ def index(object)
   def indexes(*keys)
     %x{
       var result = [],
-          map = self.map,
-          key, hash, value;
+          _map = self.map,
+          smap = self.smap,
+          map, key, khash, value;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         key = keys[i];
-        hash = key.$hash();
-        value = map[hash];
+
+        if (key.$$is_string) {
+          khash = key;
+          map = smap;
+        } else {
+          khash = key.$hash();
+          map = _map;
+        }
+
+        value = map[khash];
 
         if (value != null) {
           result.push(value);
@@ -589,22 +609,30 @@ def invert
           keys2 = result.keys,
           _map2 = result.map,
           smap2 = result.smap,
-          map, map2, key, khash;
+          map, map2, key, khash, value;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         key = keys[i];
 
         if (key.$$is_string) {
           map = smap;
-          map2 = smap2;
           khash = key;
         } else {
           map = _map;
-          map2 = _map2;
           khash = key.$hash();
         }
 
-        keys2.push(map[khash]);
+        value = map[khash];
+        keys2.push(value);
+
+        if (value.$$is_string) {
+          map2 = smap2;
+          khash = value;
+        } else {
+          map2 = _map2;
+          khash = value.$hash();
+        }
+
         map2[khash] = key;
       }
 
