opal 0.3.27 → 0.3.28

data/.gitignore

@@ -3,4 +3,5 @@
 .yardoc
 .bundle
 Gemfile.lock
-build
+build
+gh-pages

data/CONTRIBUTING.md

@@ -0,0 +1,24 @@
+# Contributing
+
+## Quick Start
+
+Clone repo:
+
+```
+$ git clone git://github.com/opal/opal.git
+```
+
+Get dependencies:
+
+```
+$ bundle
+```
+
+## Tests
+
+You need phantomjs installed to run tests. To build opal, its dependencies
+and all specs, run:
+
+```
+$ rake
+```

data/README.md

@@ -6,21 +6,22 @@ Opal is a ruby to javascript source-to-source compiler. It also has an
 implementation of the ruby corelib.
 
 Opal is [hosted on github](http://github.com/opal/opal), and there
-is a Freenode IRC channel at `#opal`. There is also a [google group for opal](http://groups.google.com/forum/#!forum/opalrb).
+is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal). There is also a [google group for opal](http://groups.google.com/forum/#!forum/opalrb).
 
 ## Usage
 
-See the website, [http://opal.github.com](http://opal.github.com).
+See the website, [http://opalrb.org](http://opalrb.org).
 
 ## Running tests
 
-Build the runtime, tests and dependencies, and then run the tests all in one
-go:
+Build the runtime, tests and dependencies, and run the tests with:
 
 ```
-$ rake
+rake
 ```
 
+You can just build opal using `rake opal`.
+
 Alternatively, after building, you can open `spec/index.html` in any
 web browser.
 

data/Rakefile

@@ -10,6 +10,16 @@ end
 # build runtime, dependencies and specs, then run the tests
 task :default => %w[opal opal:test]
 
+desc "opal.min.js and opal-parser.min.js"
+task :min do
+  %w[opal opal-parser].each do |file|
+    puts " * #{file}.min.js"
+    File.open("build/#{file}.min.js", "w+") do |o|
+      o.puts uglify(File.read "build/#{file}.js")
+    end
+  end
+end
+
 desc "Check file sizes for opal.js runtime"
 task :sizes do
   o = File.read 'build/opal.js'
@@ -44,11 +54,11 @@ def gzip(str)
 end
 
 # For testing just specific sections of opal
-desc "Build each test case"
+desc "Build each test case into build/"
 task :test_cases do
   FileUtils.mkdir_p 'build/test_cases'
 
-  sources = Dir['spec/core/*', 'spec/language', 'spec/lib', 'spec/opal']
+  sources = Dir['spec/core/*', 'spec/language', 'spec/parser', 'spec/grammar']
 
   sources.each do |c|
     dest = "build/test_cases/#{File.basename c}"

data/core/array.rb

@@ -666,21 +666,8 @@ class Array < `Array`
   def reject!(&block)
     %x{
       var original = #{self}.length;
-
-      for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
-          return __breaker.$v;
-        }
-
-        if (value !== false && value !== nil) {
-          #{self}.splice(i, 1);
-
-          length--;
-          i--;
-        }
-      }
-
-      return original === #{self}.length ? nil : #{self};
+      #{ delete_if &block };
+      return #{self}.length === original ? nil : #{self};
     }
   end
 
@@ -756,22 +743,7 @@ class Array < `Array`
   def select!(&block)
     %x{
       var original = #{self}.length;
-
-      for (var i = 0, length = original, item, value; i < length; i++) {
-        item = #{self}[i];
-
-        if ((value = block(__context, item)) === __breaker) {
-          return __breaker.$v;
-        }
-
-        if (value === false || value === nil) {
-          #{self}.splice(i, 1);
-
-          length--;
-          i--;
-        }
-      }
-
+      #{ keep_if &block };
       return #{self}.length === original ? nil : #{self};
     }
   end

data/core/enumerable.rb

@@ -96,6 +96,30 @@ module Enumerable
     }
   end
 
+  def reduce(object, &block)
+    %x{
+      var result = #{object} == undefined ? 0 : #{object};
+
+      var proc = function() {
+        var obj = __slice.call(arguments), value;
+
+        if ((value = block.apply(__context, [result].concat(obj))) === __breaker) {
+          result = __breaker.$v;
+          __breaker.$v = nil;
+
+          return __breaker;
+        }
+
+        result = value;
+      };
+
+      #{self}.$each._p = proc;
+      #{self}.$each();
+
+      return result;
+    }
+  end
+
   def count(object, &block)
     %x{
       var result = 0;
@@ -193,8 +217,8 @@ module Enumerable
           result.push(obj);
           return value;
         }
-        
-        
+
+
         return __breaker;
       };
 
@@ -283,7 +307,7 @@ module Enumerable
       var proc, result = nil, index = 0;
 
       if (object != null) {
-        proc = function (obj) { 
+        proc = function (obj) {
           if (#{ `obj` == `object` }) {
             result = index;
             return __breaker;
@@ -376,9 +400,13 @@ module Enumerable
     }
   end
 
+  alias map collect
+
   alias select find_all
 
   alias take first
 
   alias to_a entries
-end
+
+  alias inject reduce
+end

data/core/hash.rb

@@ -5,17 +5,35 @@ class Hash
     __hash = Opal.hash = function() {
       var hash   = new Hash,
           args   = __slice.call(arguments),
+          keys   = [],
           assocs = {};
 
       hash.map   = assocs;
+      hash.keys  = keys;
 
       for (var i = 0, length = args.length, key; i < length; i++) {
-        key = args[i];
-        assocs[key] = [key, args[++i]];
+        var key = args[i], obj = args[++i];
+
+        if (assocs[key] == null) {
+          keys.push(key);
+        }
+
+        assocs[key] = obj;
       }
 
       return hash;
     };
+
+    // hash2 is a faster creator for hashes that just use symbols and
+    // strings as keys. The map and keys array can be constructed at
+    // compile time, so they are just added here by the constructor
+    // function
+    __hash2 = Opal.hash2 = function(keys, map) {
+      var hash = new Hash;
+      hash.keys = keys;
+      hash.map = map;
+      return hash;
+    }
   }
 
   def self.[](*objs)
@@ -28,10 +46,11 @@ class Hash
 
   def self.from_native(obj)
     %x{
-      var hash = __hash(), map = hash.map;
+      var hash = __hash(), map = hash.map, keys = hash.keys;
 
       for (var key in obj) {
-        map[key] = [key, obj[key]]
+        keys.push(key);
+        map[key] = obj[key];
       }
 
       return hash;
@@ -59,20 +78,19 @@ class Hash
         return true;
       }
 
-      if (!other.map) {
+      if (!other.map || !other.keys) {
+        return false;
+      }
+
+      if (#{self}.keys.length !== other.keys.length) {
         return false;
       }
 
       var map  = #{self}.map,
           map2 = other.map;
 
-      for (var assoc in map) {
-        if (!map2[assoc]) {
-          return false;
-        }
-
-        var obj  = map[assoc][1],
-            obj2 = map2[assoc][1];
+      for (var i = 0, length = #{self}.keys.length; i < length; i++) {
+        var key = #{self}.keys[i], obj = map[key], obj2 = map2[key];
 
         if (#{`obj` != `obj2`}) {
           return false;
@@ -85,10 +103,10 @@ class Hash
 
   def [](key)
     %x{
-      var bucket;
+      var bucket = #{self}.map[key];
 
-      if (bucket = #{self}.map[key]) {
-        return bucket[1];
+      if (bucket != null) {
+        return bucket;
       }
 
       var proc = #{@proc};
@@ -103,7 +121,13 @@ class Hash
 
   def []=(key, value)
     %x{
-      #{self}.map[key] = [key, value];
+      var map = #{self}.map;
+
+      if (!__hasOwn.call(map, key)) {
+        #{self}.keys.push(key);
+      }
+
+      map[key] = value;
 
       return value;
     }
@@ -111,11 +135,13 @@ class Hash
 
   def assoc(object)
     %x{
-      for (var assoc in #{self}.map) {
-        var bucket = #{self}.map[assoc];
+      var keys = #{self}.keys, key;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        key = keys[i];
 
-        if (#{`bucket[0]` == `object`}) {
-          return [bucket[0], bucket[1]];
+        if (#{`key` == object}) {
+          return [key, #{self}.map[key]];
         }
       }
 
@@ -126,7 +152,7 @@ class Hash
   def clear
     %x{
       #{self}.map = {};
-
+      #{self}.keys = [];
       return #{self};
     }
   end
@@ -135,10 +161,12 @@ class Hash
     %x{
       var result = __hash(),
           map    = #{self}.map,
-          map2   = result.map;
+          map2   = result.map,
+          keys2  = result.keys;
 
-      for (var assoc in map) {
-        map2[assoc] = [map[assoc][0], map[assoc][1]];
+      for (var i = 0, length = #{self}.keys.length; i < length; i++) {
+        keys2.push(#{self}.keys[i]);
+        map2[#{self}.keys[i]] = map[#{self}.keys[i]];
       }
 
       return result;
@@ -163,12 +191,12 @@ class Hash
 
   def delete(key)
     %x{
-      var map  = #{self}.map, result;
-
-      if (result = map[key]) {
-        result = result[1];
+      var map  = #{self}.map, result = map[key];
 
+      if (result != null) {
         delete map[key];
+        #{self}.keys.$delete(key);
+
         return result;
       }
 
@@ -178,18 +206,21 @@ class Hash
 
   def delete_if(&block)
     %x{
-      var map = #{self}.map;
+      var map = #{self}.map, keys = #{self}.keys, value;
 
-      for (var assoc in map) {
-        var bucket = map[assoc],
-            value;
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
-        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          delete map[assoc];
+          keys.splice(i, 1);
+          delete map[key];
+
+          length--;
+          i--;
         }
       }
 
@@ -201,12 +232,12 @@ class Hash
 
   def each(&block)
     %x{
-      var map = #{self}.map;
+      var map = #{self}.map, keys = #{self}.keys;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-        if (block.call(__context, bucket[0], bucket[1]) === __breaker) {
+        if (block.call(__context, key, map[key]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -217,12 +248,12 @@ class Hash
 
   def each_key(&block)
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-        if (block.call(__context, bucket[0]) === __breaker) {
+        if (block.call(__context, key) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -235,12 +266,10 @@ class Hash
 
   def each_value(&block)
     %x{
-      var map = #{self}.map;
-
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      var map = #{self}.map, keys = #{self}.keys;
 
-        if (block.call(__context, bucket[1]) === __breaker) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        if (block.call(__context, map[keys[i]]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -251,11 +280,7 @@ class Hash
 
   def empty?
     %x{
-      for (var assoc in #{self}.map) {
-        return false;
-      }
-
-      return true;
+      return #{self}.keys.length === 0;
     }
   end
 
@@ -263,10 +288,10 @@ class Hash
 
   def fetch(key, defaults, &block)
     %x{
-      var bucket = #{self}.map[key];
+      var value = #{self}.map[key];
 
-      if (bucket) {
-        return bucket[1];
+      if (value != null) {
+        return value;
       }
 
       if (block !== nil) {
@@ -287,15 +312,12 @@ class Hash
     }
   end
 
-  def flatten(level)
+  def flatten(level=undefined)
     %x{
-      var map    = #{self}.map,
-          result = [];
+      var map = #{self}.map, keys = #{self}.keys, result = [];
 
-      for (var assoc in map) {
-        var bucket = map[assoc],
-            key    = bucket[0],
-            value  = bucket[1];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], value = map[key];
 
         result.push(key);
 
@@ -304,7 +326,7 @@ class Hash
             result.push(value);
           }
           else {
-            result = result.concat(#{`value`.flatten(level - 1)});
+            result = result.concat(#{`value`.flatten(`level - 1`)});
           }
         }
         else {
@@ -317,13 +339,13 @@ class Hash
   end
 
   def has_key?(key)
-    `!!#{self}.map[key]`
+    `#{self}.map[key] != null`
   end
 
   def has_value?(value)
     %x{
       for (var assoc in #{self}.map) {
-        if (#{`#{self}.map[assoc][1]` == value}) {
+        if (#{`#{self}.map[assoc]` == value}) {
           return true;
         }
       }
@@ -340,11 +362,13 @@ class Hash
 
   def index(object)
     %x{
-      for (var assoc in #{self}.map) {
-        var bucket = #{self}.map[assoc];
+      var map = #{self}.map, keys = #{self}.keys;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-        if (#{object == `bucket[1]`}) {
-          return bucket[0];
+        if (#{object == `map[key]`}) {
+          return key;
         }
       }
 
@@ -354,13 +378,13 @@ class Hash
 
   def indexes(*keys)
     %x{
-      var result = [], map = #{self}.map, bucket;
+      var result = [], map = #{self}.map, val;
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
+        var key = keys[i], val = map[key];
 
-        if (bucket = map[key]) {
-          result.push(bucket[1]);
+        if (val != null) {
+          result.push(val);
         }
         else {
           result.push(#{self}.none);
@@ -375,28 +399,27 @@ class Hash
 
   def inspect
     %x{
-      var inspect = [],
-          map     = #{self}.map;
-
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      var inspect = [], keys = #{self}.keys, map = #{self}.map;
 
-        inspect.push(#{`bucket[0]`.inspect} + '=>' + #{`bucket[1]`.inspect});
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
+        inspect.push(#{`key`.inspect} + '=>' + #{`map[key]`.inspect});
       }
+
       return '{' + inspect.join(', ') + '}';
     }
   end
 
   def invert
     %x{
-      var result = __hash(),
-          map    = #{self}.map,
-          map2   = result.map;
+      var result = __hash(), keys = #{self}.keys, map = #{self}.map,
+          keys2 = result.keys, map2 = result.map;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
-        map2[bucket[1]] = [bucket[1], bucket[0]];
+        keys2.push(obj);
+        map2[obj] = key;
       }
 
       return result;
@@ -405,17 +428,21 @@ class Hash
 
   def keep_if(&block)
     %x{
-      var map = #{self}.map, value;
+      var map = #{self}.map, keys = #{self}.keys, value;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
-        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
-          delete map[assoc];
+          keys.splice(i, 1);
+          delete map[key];
+
+          length--;
+          i--;
         }
       }
 
@@ -429,25 +456,13 @@ class Hash
 
   def keys
     %x{
-      var result = [];
-
-      for (var assoc in #{self}.map) {
-        result.push(#{self}.map[assoc][0]);
-      }
-
-      return result;
+      return #{self}.keys.slice(0);
     }
   end
 
   def length
     %x{
-      var result = 0;
-
-      for (var assoc in #{self}.map) {
-        result++;
-      }
-
-      return result;
+      return #{self}.keys.length;
     }
   end
 
@@ -455,34 +470,40 @@ class Hash
 
   def merge(other, &block)
     %x{
-      var result = __hash(),
-          map    = #{self}.map,
-          map2   = result.map;
+      var keys = #{self}.keys, map = #{self}.map,
+          result = __hash(), keys2 = result.keys, map2 = result.map;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-        map2[assoc] = [bucket[0], bucket[1]];
+        keys2.push(key);
+        map2[key] = map[key];
       }
 
-      map = other.map;
+      var keys = other.keys, map = other.map;
 
       if (block === nil) {
-        for (var assoc in map) {
-          var bucket = map[assoc];
+        for (var i = 0, length = keys.length; i < length; i++) {
+          var key = keys[i];
+
+          if (map2[key] == null) {
+            keys2.push(key);
+          }
 
-          map2[assoc] = [bucket[0], bucket[1]];
+          map2[key] = map[key];
         }
       }
       else {
-        for (var assoc in map) {
-          var bucket = map[assoc], key = bucket[0], val = bucket[1];
+        for (var i = 0, length = keys.length; i < length; i++) {
+          var key = keys[i];
 
-          if (__hasOwn.call(map2, assoc)) {
-            val = block.call(__context, key, map2[assoc][1], val);
+          if (map2[key] == null) {
+            keys2.push(key);
+            map2[key] = map[key];
+          }
+          else {
+            map2[key] = block.call(__context, key, map2[key], map[key]);
           }
-
-          map2[assoc] = [key, val];
         }
       }
 
@@ -492,25 +513,31 @@ class Hash
 
   def merge!(other, &block)
     %x{
-      var map  = #{self}.map,
-          map2 = other.map;
+      var keys = #{self}.keys, map = #{self}.map,
+          keys2 = other.keys, map2 = other.map;
 
       if (block === nil) {
-        for (var assoc in map2) {
-          var bucket = map2[assoc];
+        for (var i = 0, length = keys2.length; i < length; i++) {
+          var key = keys2[i];
 
-          map[assoc] = [bucket[0], bucket[1]];
+          if (map[key] == null) {
+            keys.push(key);
+          }
+
+          map[key] = map2[key];
         }
       }
       else {
-        for (var assoc in map2) {
-          var bucket = map2[assoc], key = bucket[0], val = bucket[1];
+        for (var i = 0, length = keys2.length; i < length; i++) {
+          var key = keys2[i];
 
-          if (__hasOwn.call(map, assoc)) {
-            val = block.call(__context, key, map[assoc][1], val);
+          if (map[key] == null) {
+            keys.push(key);
+            map[key] = map2[key];
+          }
+          else {
+            map[key] = block.call(__context, key, map[key], map2[key]);
           }
-
-          map[assoc] = [key, val];
         }
       }
 
@@ -520,13 +547,13 @@ class Hash
 
   def rassoc(object)
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys, map = #{self}.map;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
-        if (#{`bucket[1]` == object}) {
-          return [bucket[0], bucket[1]];
+        if (#{`obj` == object}) {
+          return [key, obj];
         }
       }
 
@@ -536,18 +563,19 @@ class Hash
 
   def reject(&block)
     %x{
-      var map = #{self}.map, result = __hash(), map2 = result.map;
+      var keys = #{self}.keys, map = #{self}.map,
+          result = __hash(), map2 = result.map, keys2 = result.keys;
 
-      for (var assoc in map) {
-        var bucket = map[assoc],
-            value;
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key], value;
 
-        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
-          map2[bucket[0]] = [bucket[0], bucket[1]];
+          keys2.push(key);
+          map2[key] = obj;
         }
       }
 
@@ -557,12 +585,12 @@ class Hash
 
   def replace(other)
     %x{
-      var map = #{self}.map = {};
-
-      for (var assoc in other.map) {
-        var bucket = other.map[assoc];
+      var map = #{self}.map = {}, keys = #{self}.keys = [];
 
-        map[bucket[0]] = [bucket[0], bucket[1]];
+      for (var i = 0, length = other.keys.length; i < length; i++) {
+        var key = other.keys[i];
+        keys.push(key);
+        map[key] = other.map[key];
       }
 
       return #{self};
@@ -571,18 +599,19 @@ class Hash
 
   def select(&block)
     %x{
-      var map = #{self}.map, result = __hash(), map2 = result.map;
+      var keys = #{self}.keys, map = #{self}.map,
+          result = __hash(), map2 = result.map, keys2 = result.keys;
 
-      for (var assoc in map) {
-        var bucket = map[assoc],
-            value;
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key], value;
 
-        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          map2[bucket[0]] = [bucket[0], bucket[1]];
+          keys2.push(key);
+          map2[key] = obj;
         }
       }
 
@@ -592,19 +621,22 @@ class Hash
 
   def select!(&block)
     %x{
-      var map = #{self}.map, result = nil;
+      var map = #{self}.map, keys = #{self}.keys, value, result = nil;
 
-      for (var assoc in map) {
-        var bucket = map[assoc],
-            value;
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
-        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
-          delete map[assoc];
-          result = #{self};
+          keys.splice(i, 1);
+          delete map[key];
+
+          length--;
+          i--;
+          result = #{self}
         }
       }
 
@@ -614,12 +646,15 @@ class Hash
 
   def shift
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys, map = #{self}.map;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
-        delete map[assoc];
-        return [bucket[0], bucket[1]];
+      if (keys.length) {
+        var key = keys[0], obj = map[key];
+
+        delete map[key];
+        keys.splice(0, 1);
+
+        return [key, obj];
       }
 
       return nil;
@@ -630,13 +665,11 @@ class Hash
 
   def to_a
     %x{
-      var map    = #{self}.map,
-          result = [];
+      var keys = #{self}.keys, map = #{self}.map, result = [];
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
-
-        result.push([bucket[0], bucket[1]]);
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
+        result.push([key, map[key]]);
       }
 
       return result;
@@ -649,30 +682,29 @@ class Hash
 
   def to_json
     %x{
-      var parts = [], map = #{self}.map, bucket;
+      var inspect = [], keys = #{self}.keys, map = #{self}.map;
 
-      for (var assoc in map) {
-        bucket = map[assoc];
-        parts.push(#{ `bucket[0]`.to_json } + ': ' + #{ `bucket[1]`.to_json });
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
+        inspect.push(#{`key`.to_json} + ': ' + #{`map[key]`.to_json});
       }
 
-      return '{' + parts.join(', ') + '}';
+      return '{' + inspect.join(', ') + '}';
     }
   end
 
   def to_native
     %x{
-      var result = {}, map = #{self}.map, bucket, value;
+      var result = {}, keys = #{self}.keys, map = #{self}.map, bucket, value;
 
-      for (var assoc in map) {
-        bucket = map[assoc];
-        value  = bucket[1];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
-        if (value.$to_native) {
-          result[assoc] = #{ `value`.to_native };
+        if (obj.$to_native) {
+          result[key] = #{`obj`.to_native};
         }
         else {
-          result[assoc] = value;
+          result[key] = obj;
         }
       }
 
@@ -689,7 +721,7 @@ class Hash
       var map = #{self}.map;
 
       for (var assoc in map) {
-        var v = map[assoc][1];
+        var v = map[assoc];
         if (#{`v` == value}) {
           return true;
         }
@@ -706,8 +738,8 @@ class Hash
       var map    = #{self}.map,
           result = [];
 
-      for (var assoc in map) {
-        result.push(map[assoc][1]);
+      for (var key in map) {
+        result.push(map[key]);
       }
 
       return result;