opal 1.3.1 → 1.4.1

data/opal/corelib/hash.rb

@@ -1,3 +1,5 @@
+# helpers: yield1, hash, hash_init, hash_get, hash_put, hash_delete
+
 require 'corelib/enumerable'
 
 # ---
@@ -8,8 +10,8 @@ require 'corelib/enumerable'
 # - $$keys        [Array<hash-bucket>] the list of all keys
 # - $$proc        [Proc,null,nil] the default proc used for missing keys
 # - hash-bucket   [JS::Object] an element of a linked list that holds hash values, keys are `{key:,key_hash:,value:,next:}`
-class Hash
-  include Enumerable
+class ::Hash
+  include ::Enumerable
 
   # Mark all hash instances as valid hashes (used to check keyword args, etc)
   `self.$$prototype.$$is_hash = true`
@@ -19,14 +21,14 @@ class Hash
       var hash, argc = argv.length, i;
 
       if (argc === 1) {
-        hash = #{Opal.coerce_to?(argv[0], Hash, :to_hash)};
+        hash = #{::Opal.coerce_to?(argv[0], ::Hash, :to_hash)};
         if (hash !== nil) {
           return #{allocate.merge!(`hash`)};
         }
 
-        argv = #{Opal.coerce_to?(argv[0], Array, :to_ary)};
+        argv = #{::Opal.coerce_to?(argv[0], ::Array, :to_ary)};
         if (argv === nil) {
-          #{raise ArgumentError, 'odd number of arguments for Hash'}
+          #{::Kernel.raise ::ArgumentError, 'odd number of arguments for Hash'}
         }
 
         argc = argv.length;
@@ -42,7 +44,7 @@ class Hash
             hash.$store(argv[i][0], argv[i][1]);
             break;
           default:
-            #{raise ArgumentError, "invalid number of elements (#{`argv[i].length`} for 1..2)"}
+            #{::Kernel.raise ::ArgumentError, "invalid number of elements (#{`argv[i].length`} for 1..2)"}
           }
         }
 
@@ -50,7 +52,7 @@ class Hash
       }
 
       if (argc % 2 !== 0) {
-        #{raise ArgumentError, 'odd number of arguments for Hash'}
+        #{::Kernel.raise ::ArgumentError, 'odd number of arguments for Hash'}
       }
 
       hash = #{allocate};
@@ -67,7 +69,7 @@ class Hash
     %x{
       var hash = new self.$$constructor();
 
-      Opal.hash_init(hash);
+      $hash_init(hash);
 
       hash.$$none = nil;
       hash.$$proc = nil;
@@ -77,13 +79,13 @@ class Hash
   end
 
   def self.try_convert(obj)
-    Opal.coerce_to?(obj, Hash, :to_hash)
+    ::Opal.coerce_to?(obj, ::Hash, :to_hash)
   end
 
   def initialize(defaults = undefined, &block)
     %x{
       if (defaults !== undefined && block !== nil) {
-        #{raise ArgumentError, 'wrong number of arguments (1 for 0)'}
+        #{::Kernel.raise ::ArgumentError, 'wrong number of arguments (1 for 0)'}
       }
       self.$$none = (defaults === undefined ? nil : defaults);
       self.$$proc = block;
@@ -114,7 +116,7 @@ class Hash
           other_value = other.$$smap[key];
         } else {
           value = key.value;
-          other_value = Opal.hash_get(other, key.key);
+          other_value = $hash_get(other, key.key);
         }
 
         if (other_value === undefined || !value['$eql?'](other_value)) {
@@ -127,7 +129,7 @@ class Hash
   end
 
   def >=(other)
-    other = Opal.coerce_to!(other, Hash, :to_hash)
+    other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
 
     %x{
       if (self.$$keys.length < other.$$keys.length) {
@@ -152,7 +154,7 @@ class Hash
   end
 
   def >(other)
-    other = Opal.coerce_to!(other, Hash, :to_hash)
+    other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
 
     %x{
       if (self.$$keys.length <= other.$$keys.length) {
@@ -164,18 +166,18 @@ class Hash
   end
 
   def <(other)
-    other = Opal.coerce_to!(other, Hash, :to_hash)
+    other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
     other > self
   end
 
   def <=(other)
-    other = Opal.coerce_to!(other, Hash, :to_hash)
+    other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
     other >= self
   end
 
   def [](key)
     %x{
-      var value = Opal.hash_get(self, key);
+      var value = $hash_get(self, key);
 
       if (value !== undefined) {
         return value;
@@ -187,7 +189,7 @@ class Hash
 
   def []=(key, value)
     %x{
-      Opal.hash_put(self, key, value);
+      $hash_put(self, key, value);
       return value;
     }
   end
@@ -214,7 +216,7 @@ class Hash
 
   def clear
     %x{
-      Opal.hash_init(self);
+      $hash_init(self);
       return self;
     }
   end
@@ -223,7 +225,7 @@ class Hash
     %x{
       var hash = new self.$$class();
 
-      Opal.hash_init(hash);
+      $hash_init(hash);
       Opal.hash_clone(self, hash);
 
       return hash;
@@ -232,7 +234,7 @@ class Hash
 
   def compact
     %x{
-      var hash = Opal.hash();
+      var hash = $hash();
 
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
@@ -245,7 +247,7 @@ class Hash
         }
 
         if (value !== nil) {
-          Opal.hash_put(hash, key, value);
+          $hash_put(hash, key, value);
         }
       }
 
@@ -268,7 +270,7 @@ class Hash
         }
 
         if (value === nil) {
-          if (Opal.hash_delete(self, key) !== undefined) {
+          if ($hash_delete(self, key) !== undefined) {
             changes_were_made = true;
             length--;
             i--;
@@ -294,7 +296,7 @@ class Hash
       for(i = 0, ii = keys.length; i < ii; i++) {
         key = keys[i];
         if (!key.$$is_string) key = key.key;
-        Opal.hash_put(identity_hash, key, Opal.hash_get(self, key));
+        $hash_put(identity_hash, key, $hash_get(self, key));
       }
 
       self.$$by_identity = true;
@@ -343,10 +345,10 @@ class Hash
       var proc = default_proc;
 
       if (proc !== nil) {
-        proc = #{Opal.coerce_to!(`proc`, Proc, :to_proc)};
+        proc = #{::Opal.coerce_to!(`proc`, ::Proc, :to_proc)};
 
         if (#{`proc`.lambda?} && #{`proc`.arity.abs} !== 2) {
-          #{raise TypeError, 'default_proc takes two arguments'};
+          #{::Kernel.raise ::TypeError, 'default_proc takes two arguments'};
         }
       }
 
@@ -359,7 +361,7 @@ class Hash
 
   def delete(key, &block)
     %x{
-      var value = Opal.hash_delete(self, key);
+      var value = $hash_delete(self, key);
 
       if (value !== undefined) {
         return value;
@@ -390,7 +392,7 @@ class Hash
         obj = block(key, value);
 
         if (obj !== false && obj !== nil) {
-          if (Opal.hash_delete(self, key) !== undefined) {
+          if ($hash_delete(self, key) !== undefined) {
             length--;
             i--;
           }
@@ -401,8 +403,6 @@ class Hash
     }
   end
 
-  alias dup clone
-
   def dig(key, *keys)
     item = self[key]
 
@@ -413,7 +413,7 @@ class Hash
     }
 
     unless item.respond_to?(:dig)
-      raise TypeError, "#{item.class} does not have #dig method"
+      ::Kernel.raise ::TypeError, "#{item.class} does not have #dig method"
     end
 
     item.dig(*keys)
@@ -433,7 +433,7 @@ class Hash
           key = key.key;
         }
 
-        Opal.yield1(block, [key, value]);
+        $yield1(block, [key, value]);
       }
 
       return self;
@@ -454,8 +454,6 @@ class Hash
     }
   end
 
-  alias each_pair each
-
   def each_value(&block)
     return enum_for(:each_value) { size } unless block
 
@@ -474,8 +472,6 @@ class Hash
     `self.$$keys.length === 0`
   end
 
-  alias eql? ==
-
   def except(*keys)
     dup.except!(*keys)
   end
@@ -487,7 +483,7 @@ class Hash
 
   def fetch(key, defaults = undefined, &block)
     %x{
-      var value = Opal.hash_get(self, key);
+      var value = $hash_get(self, key);
 
       if (value !== undefined) {
         return value;
@@ -502,7 +498,7 @@ class Hash
       }
     }
 
-    raise KeyError.new("key not found: #{key.inspect}", key: key, receiver: self)
+    ::Kernel.raise ::KeyError.new("key not found: #{key.inspect}", key: key, receiver: self)
   end
 
   def fetch_values(*keys, &block)
@@ -510,7 +506,7 @@ class Hash
   end
 
   def flatten(level = 1)
-    level = Opal.coerce_to!(level, Integer, :to_int)
+    level = ::Opal.coerce_to!(level, ::Integer, :to_int)
 
     %x{
       var result = [];
@@ -545,7 +541,7 @@ class Hash
   end
 
   def has_key?(key)
-    `Opal.hash_get(self, key) !== undefined`
+    `$hash_get(self, key) !== undefined`
   end
 
   def has_value?(value)
@@ -607,8 +603,6 @@ class Hash
     }
   end
 
-  alias include? has_key?
-
   def index(object)
     %x{
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
@@ -636,7 +630,7 @@ class Hash
 
       for (var i = 0, length = args.length, key, value; i < length; i++) {
         key = args[i];
-        value = Opal.hash_get(self, key);
+        value = $hash_get(self, key);
 
         if (value === undefined) {
           result.push(#{default});
@@ -650,8 +644,6 @@ class Hash
     }
   end
 
-  alias indices indexes
-
   `var inspect_ids`
 
   def inspect
@@ -659,8 +651,10 @@ class Hash
       var top = (inspect_ids === undefined),
           hash_id = self.$object_id(),
           result = [];
+    }
 
-      try {
+    begin
+      %x{
         if (top) {
           inspect_ids = {};
         }
@@ -681,22 +675,23 @@ class Hash
             key = key.key;
           }
 
-          result.push(key.$inspect() + '=>' + value.$inspect());
+          key = #{Opal.inspect(`key`)}
+          value = #{Opal.inspect(`value`)}
+
+          result.push(key + '=>' + value);
         }
 
         return '{' + result.join(', ') + '}';
-
-      } finally {
-        if (top) {
-          inspect_ids = undefined;
-        }
       }
-    }
+      nil
+    ensure
+      `if (top) inspect_ids = undefined`
+    end
   end
 
   def invert
     %x{
-      var hash = Opal.hash();
+      var hash = $hash();
 
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
@@ -708,7 +703,7 @@ class Hash
           key = key.key;
         }
 
-        Opal.hash_put(hash, value, key);
+        $hash_put(hash, value, key);
       }
 
       return hash;
@@ -732,7 +727,7 @@ class Hash
         obj = block(key, value);
 
         if (obj === false || obj === nil) {
-          if (Opal.hash_delete(self, key) !== undefined) {
+          if ($hash_delete(self, key) !== undefined) {
             length--;
             i--;
           }
@@ -743,10 +738,6 @@ class Hash
     }
   end
 
-  alias key index
-
-  alias key? has_key?
-
   def keys
     %x{
       var result = [];
@@ -769,8 +760,6 @@ class Hash
     `self.$$keys.length`
   end
 
-  alias member? has_key?
-
   def merge(*others, &block)
     dup.merge!(*others, &block)
   end
@@ -779,7 +768,7 @@ class Hash
     %x{
       var i, j, other, other_keys, length, key, value, other_value;
       for (i = 0; i < others.length; ++i) {
-        other = #{Opal.coerce_to!(`others[i]`, Hash, :to_hash)};
+        other = #{::Opal.coerce_to!(`others[i]`, ::Hash, :to_hash)};
         other_keys = other.$$keys, length = other_keys.length;
 
         if (block === nil) {
@@ -793,7 +782,7 @@ class Hash
               key = key.key;
             }
 
-            Opal.hash_put(self, key, other_value);
+            $hash_put(self, key, other_value);
           }
         } else {
           for (j = 0; j < length; j++) {
@@ -806,14 +795,14 @@ class Hash
               key = key.key;
             }
 
-            value = Opal.hash_get(self, key);
+            value = $hash_get(self, key);
 
             if (value === undefined) {
-              Opal.hash_put(self, key, other_value);
+              $hash_put(self, key, other_value);
               continue;
             }
 
-            Opal.hash_put(self, key, block(key, value, other_value));
+            $hash_put(self, key, block(key, value, other_value));
           }
         }
       }
@@ -854,7 +843,7 @@ class Hash
     return enum_for(:reject) { size } unless block
 
     %x{
-      var hash = Opal.hash();
+      var hash = $hash();
 
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
@@ -869,7 +858,7 @@ class Hash
         obj = block(key, value);
 
         if (obj === false || obj === nil) {
-          Opal.hash_put(hash, key, value);
+          $hash_put(hash, key, value);
         }
       }
 
@@ -896,7 +885,7 @@ class Hash
         obj = block(key, value);
 
         if (obj !== false && obj !== nil) {
-          if (Opal.hash_delete(self, key) !== undefined) {
+          if ($hash_delete(self, key) !== undefined) {
             changes_were_made = true;
             length--;
             i--;
@@ -909,10 +898,10 @@ class Hash
   end
 
   def replace(other)
-    other = Opal.coerce_to!(other, Hash, :to_hash)
+    other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
 
     %x{
-      Opal.hash_init(self);
+      $hash_init(self);
 
       for (var i = 0, other_keys = other.$$keys, length = other_keys.length, key, value, other_value; i < length; i++) {
         key = other_keys[i];
@@ -924,7 +913,7 @@ class Hash
           key = key.key;
         }
 
-        Opal.hash_put(self, key, other_value);
+        $hash_put(self, key, other_value);
       }
     }
 
@@ -941,7 +930,7 @@ class Hash
     return enum_for(:select) { size } unless block
 
     %x{
-      var hash = Opal.hash();
+      var hash = $hash();
 
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
         key = keys[i];
@@ -956,7 +945,7 @@ class Hash
         obj = block(key, value);
 
         if (obj !== false && obj !== nil) {
-          Opal.hash_put(hash, key, value);
+          $hash_put(hash, key, value);
         }
       }
 
@@ -983,7 +972,7 @@ class Hash
         obj = block(key, value);
 
         if (obj === false || obj === nil) {
-          if (Opal.hash_delete(self, key) !== undefined) {
+          if ($hash_delete(self, key) !== undefined) {
             length--;
             i--;
           }
@@ -995,9 +984,6 @@ class Hash
     }
   end
 
-  alias filter select
-  alias filter! select!
-
   def shift
     %x{
       var keys = self.$$keys,
@@ -1008,24 +994,22 @@ class Hash
 
         key = key.$$is_string ? key : key.key;
 
-        return [key, Opal.hash_delete(self, key)];
+        return [key, $hash_delete(self, key)];
       }
 
       return self.$default(nil);
     }
   end
 
-  alias size length
-
   def slice(*keys)
     %x{
-      var result = Opal.hash();
+      var result = $hash();
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i], value = Opal.hash_get(self, key);
+        var key = keys[i], value = $hash_get(self, key);
 
         if (value !== undefined) {
-          Opal.hash_put(result, key, value);
+          $hash_put(result, key, value);
         }
       }
 
@@ -1033,8 +1017,6 @@ class Hash
     }
   end
 
-  alias store []=
-
   def to_a
     %x{
       var result = [];
@@ -1066,7 +1048,7 @@ class Hash
 
       var hash = new Opal.Hash();
 
-      Opal.hash_init(hash);
+      $hash_init(hash);
       Opal.hash_clone(self, hash);
 
       return hash;
@@ -1081,7 +1063,7 @@ class Hash
     proc do |key = undefined|
       %x{
         if (key == null) {
-          #{raise ArgumentError, 'no key given'}
+          #{::Kernel.raise ::ArgumentError, 'no key given'}
         }
       }
 
@@ -1089,13 +1071,11 @@ class Hash
     end
   end
 
-  alias to_s inspect
-
   def transform_keys(&block)
     return enum_for(:transform_keys) { size } unless block
 
     %x{
-      var result = Opal.hash();
+      var result = $hash();
 
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
@@ -1107,9 +1087,9 @@ class Hash
           key = key.key;
         }
 
-        key = Opal.yield1(block, key);
+        key = $yield1(block, key);
 
-        Opal.hash_put(result, key, value);
+        $hash_put(result, key, value);
       }
 
       return result;
@@ -1133,10 +1113,10 @@ class Hash
           key = key.key;
         }
 
-        new_key = Opal.yield1(block, key);
+        new_key = $yield1(block, key);
 
-        Opal.hash_delete(self, key);
-        Opal.hash_put(self, new_key, value);
+        $hash_delete(self, key);
+        $hash_put(self, new_key, value);
       }
 
       return self;
@@ -1147,7 +1127,7 @@ class Hash
     return enum_for(:transform_values) { size } unless block
 
     %x{
-      var result = Opal.hash();
+      var result = $hash();
 
       for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
         key = keys[i];
@@ -1159,9 +1139,9 @@ class Hash
           key = key.key;
         }
 
-        value = Opal.yield1(block, value);
+        value = $yield1(block, value);
 
-        Opal.hash_put(result, key, value);
+        $hash_put(result, key, value);
       }
 
       return result;
@@ -1182,21 +1162,15 @@ class Hash
           key = key.key;
         }
 
-        value = Opal.yield1(block, value);
+        value = $yield1(block, value);
 
-        Opal.hash_put(self, key, value);
+        $hash_put(self, key, value);
       }
 
       return self;
     }
   end
 
-  alias update merge!
-
-  alias value? has_value?
-
-  alias values_at indexes
-
   def values
     %x{
       var result = [];
@@ -1214,4 +1188,21 @@ class Hash
       return result;
     }
   end
+
+  alias dup clone
+  alias each_pair each
+  alias eql? ==
+  alias filter select
+  alias filter! select!
+  alias include? has_key?
+  alias indices indexes
+  alias key index
+  alias key? has_key?
+  alias member? has_key?
+  alias size length
+  alias store []=
+  alias to_s inspect
+  alias update merge!
+  alias value? has_value?
+  alias values_at indexes
 end