opal 0.3.16 → 0.3.17

data/core/enumerator.rb

@@ -77,7 +77,7 @@ class Enumerator
   def each(&block)
     return self unless block
 
-    @object.__send__ @method, *args, &block
+    @object.__send__ @method, *@args, &block
   end
 
   def each_with_index(&block)
@@ -85,7 +85,7 @@ class Enumerator
   end
 
   def with_index(offset = 0)
-    return Enumerator.new(self, :with_index, offset) unless block_given?
+    return enum_for :with_index, offset unless block_given?
 
     current = 0
 
@@ -99,7 +99,7 @@ class Enumerator
   end
 
   def with_object(object)
-    return Enumerator.new(self, :with_object, object) unless block_given?
+    return enum_for :with_object, object unless block_given?
 
     each {|*args|
       yield *args, object

data/core/hash.rb

@@ -4,19 +4,33 @@ class Hash
   %x{
     var hash_class = this;
 
-    $opal.hash = function() {
-      var hash    = new hash_class.$allocator(),
-          args    = $slice.call(arguments),
-          assocs  = {},
-          key;
+    Opal.hash = function() {
+      var hash    = new hash_class._alloc(),
+          args    = __slice.call(arguments),
+          assocs  = {};
 
       hash.map    = assocs;
       hash.none   = nil;
       hash.proc   = nil;
 
-      for (var i = 0, length = args.length; i < length; i++) {
-        key = args[i];
-        assocs[key.$hash()] = [key, args[++i]];
+      if (args.length == 1 && args[0]._flags & T_ARRAY) {
+        args = args[0];
+
+        for (var i = 0, length = args.length, key; i < length; i++) {
+          key = args[i][0];
+
+          assocs[key] = [key, args[i][1]];
+        }
+      }
+      else if (arguments.length % 2 == 0) {
+        for (var i = 0, length = args.length, key; i < length; i++) {
+          key = args[i];
+
+          assocs[key] = [key, args[++i]];
+        }
+      }
+      else {
+        throw RubyArgError.$new('odd number of arguments for Hash');
       }
 
       return hash;
@@ -27,14 +41,18 @@ class Hash
     `$opal.hash.apply(null, objs)`
   end
 
+  def self.allocate
+    `Opal.hash()`
+  end
+
   def self.new(defaults = undefined, &block)
     %x{
-      var hash = $opal.hash();
+      var hash = Opal.hash();
 
-      if (defaults !== undefined) {
+      if (defaults != undefined) {
         hash.none = defaults;
       }
-      else if (block !== nil) {
+      else if (block != null) {
         hash.proc = block;
       }
 
@@ -74,10 +92,9 @@ class Hash
 
   def [](key)
     %x{
-      var hash = #{key.hash},
-          bucket;
+      var bucket;
 
-      if (bucket = this.map[hash]) {
+      if (bucket = this.map[key]) {
         return bucket[1];
       }
 
@@ -87,8 +104,7 @@ class Hash
 
   def []=(key, value)
     %x{
-      var hash       = #{key.hash};
-      this.map[hash] = [key, value];
+      this.map[key] = [key, value];
 
       return value;
     }
@@ -118,7 +134,7 @@ class Hash
 
   def clone
     %x{
-      var result = $opal.hash(),
+      var result = Opal.hash(),
           map    = this.map,
           map2   = result.map;
 
@@ -148,14 +164,12 @@ class Hash
 
   def delete(key)
     %x{
-      var map  = this.map,
-          hash = #{key.hash},
-          result;
+      var map  = this.map, result;
 
-      if (result = map[hash]) {
+      if (result = map[key]) {
         result = bucket[1];
 
-        delete map[hash];
+        delete map[key];
       }
 
       return result;
@@ -172,11 +186,11 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = $yield.call($context, bucket[0], bucket[1])) === $breaker) {
+        if ((value = block.call($context, null, bucket[0], bucket[1])) === $breaker) {
           return $breaker.$v;
         }
 
-        if (value !== false && value !== nil) {
+        if (value !== false && value !== null) {
           delete map[assoc];
         }
       }
@@ -194,7 +208,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ($yield.call($context, bucket[0], bucket[1]) === $breaker) {
+        if (block.call($context, null, bucket[0], bucket[1]) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -212,7 +226,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ($yield.call($context, bucket[0]) === $breaker) {
+        if (block.call($context, null, bucket[0]) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -232,7 +246,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ($yield.call($context, bucket[1]) === $breaker) {
+        if (block.call($context, null, bucket[1]) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -255,12 +269,12 @@ class Hash
 
   def fetch(key, defaults = undefined, &block)
     %x{
-      var bucket = this.map[#{key.hash}];
+      var bucket = this.map[key];
 
-      if (block !== nil) {
+      if (block !== null) {
         var value;
 
-        if ((value = $yield.call($context, key)) === $breaker) {
+        if ((value = block.call($context, null, key)) === $breaker) {
           return $breaker.$v;
         }
 
@@ -271,7 +285,7 @@ class Hash
         return defaults;
       }
 
-      raise(RubyKeyError, 'key not found');
+      throw RubyKeyError.$new('key not found');
     }
   end
 
@@ -287,7 +301,7 @@ class Hash
 
         result.push(key);
 
-        if (value.$flags & T_ARRAY) {
+        if (value._flags & T_ARRAY) {
           if (level === undefined || level === 1) {
             result.push(value);
           }
@@ -305,7 +319,7 @@ class Hash
   end
 
   def has_key?(key)
-    `!!this.map[#{key.hash}]`
+    `!!this.map[key]`
   end
 
   def has_value?(value)
@@ -321,7 +335,7 @@ class Hash
   end
 
   def hash
-    `this.$id`
+    `this._id`
   end
 
   def inspect
@@ -347,7 +361,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        map2[#{`bucket[1]`.hash}] = [bucket[0], bucket[1]];
+        map2[bucket[1]] = [bucket[0], bucket[1]];
       }
 
       return result;
@@ -364,7 +378,7 @@ class Hash
         }
       }
 
-      return nil;
+      return null;
     }
   end
 
@@ -396,9 +410,9 @@ class Hash
 
   alias member? has_key?
 
-  def merge(other)
+  def merge(other, &block)
     %x{
-      var result = $opal.hash(),
+      var result = Opal.hash(),
           map    = this.map,
           map2   = result.map;
 
@@ -410,25 +424,51 @@ class Hash
 
       map = other.map;
 
-      for (var assoc in map) {
-        var bucket = map[assoc];
+      if (block === null) {
+        for (var assoc in map) {
+          var bucket = map[assoc];
 
-        map2[assoc] = [bucket[0], bucket[1]];
+          map2[assoc] = [bucket[0], bucket[1]];
+        }
+      }
+      else {
+        for (var assoc in map) {
+          var bucket = map[assoc], key = bucket[0], val = bucket[1];
+
+          if (map2.hasOwnProperty(assoc)) {
+            val = block.call(__context, key, map2[assoc][1], val);
+          }
+
+          map2[assoc] = [key, val];
+        }
       }
 
       return result;
     }
   end
 
-  def merge!(other)
+  def merge!(other, &block)
     %x{
       var map  = this.map,
           map2 = other.map;
 
-      for (var assoc in map2) {
-        var bucket = map2[assoc];
+      if (block === null) {
+        for (var assoc in map2) {
+          var bucket = map2[assoc];
 
-        map[assoc] = [bucket[0], bucket[1]];
+          map[assoc] = [bucket[0], bucket[1]];
+        }
+      }
+      else {
+        for (var assoc in map2) {
+          var bucket = map2[assoc], key = bucket[0], val = bucket[1];
+
+          if (map.hasOwnProperty(assoc)) {
+            val = block.call($context, null, key, map[assoc][1], val);
+          }
+
+          map[assoc] = [key, val];
+        }
       }
 
       return this;
@@ -447,7 +487,7 @@ class Hash
         }
       }
 
-      return nil;
+      return null;
     }
   end
 

data/core/kernel.rb

@@ -31,8 +31,8 @@ module Kernel
 
   def at_exit(&block)
     %x{
-      if (block === nil) {
-        raise(RubyArgError, 'called without a block');
+      if (block === null) {
+        throw RubyArgError.$new('called without a block');
       }
 
       end_procs.push(block);
@@ -42,16 +42,16 @@ module Kernel
   end
 
   def class
-    `class_real(this.$klass)`
+    `class_real(this._klass)`
   end
 
-  def define_singleton_method(&body)
+  def define_singleton_method(name, &body)
     %x{
-      if (body === nil) {
-        raise(RubyLocalJumpError, 'no block given');
+      if (body === null) {
+        throw RubyLocalJumpError.$new('no block given');
       }
 
-      $opal.ds(this, name, body);
+      opal.defs(this, mid_to_jsid(name), body);
 
       return this;
     }
@@ -71,8 +71,12 @@ module Kernel
     }
   end
 
+  def format(string, *arguments)
+    raise NotImplementedError
+  end
+
   def hash
-    `this.$id`
+    `this._id`
   end
 
   def inspect
@@ -80,7 +84,7 @@ module Kernel
   end
 
   def instance_of?(klass)
-    `this.$klass === klass`
+    `this._klass === klass`
   end
 
   def instance_variable_defined?(name)
@@ -91,7 +95,7 @@ module Kernel
     %x{
       var ivar = this[name.substr(1)];
 
-      return ivar == undefined ? nil : ivar;
+      return ivar == undefined ? null : ivar;
     }
   end
 
@@ -113,14 +117,14 @@ module Kernel
 
   def is_a?(klass)
     %x{
-      var search = this.$klass;
+      var search = this._klass;
 
       while (search) {
         if (search === klass) {
           return true;
         }
 
-        search = search.$s;
+        search = search._super;
       }
 
       return false;
@@ -138,7 +142,7 @@ module Kernel
 
     %x{
       while (true) {
-        if ($yield.call($context) === breaker) {
+        if (block.call(__context) === breaker) {
           return breaker.$v;
         }
       }
@@ -152,14 +156,15 @@ module Kernel
   end
 
   def object_id
-    `this.$id || (this.$id = unique_id++)`
+    `this._id || (this._id = unique_id++)`
   end
 
   def print(*strs)
-    $stdout.print *strs
+    puts *strs
   end
 
   def private(*)
+    # does nothing. here for documenting code
   end
 
   def proc(&block)
@@ -167,15 +172,24 @@ module Kernel
   end
 
   def protected(*)
+    # does nothing. here for documenting code
   end
 
   def public(*)
+    # does nothing. here for documenting code
   end
 
   def puts(*strs)
-    $stdout.puts *strs
+    %x{
+      for (var i = 0; i < strs.length; i++) {
+        var obj = strs[i];
+        console.log(obj == null ? "nil" : obj.$to_s());
+      }
+    }
   end
 
+  alias sprintf format
+
   def raise(exception, string = undefined)
     %x{
       if (typeof(exception) === 'string') {
@@ -194,42 +208,44 @@ module Kernel
   end
 
   def require(path)
+    `require_handler(path);`
+  end
+
+  def respond_to?(name)
+    `!!this[mid_to_jsid(name)]`
+  end
+
+  def singleton_class
     %x{
-      var resolved = find_lib(path);
+      var obj = this, klass;
 
-      if (!resolved) {
-        raise(RubyLoadError, 'no such file to load -- ' + path);
+      if (obj._flags & T_OBJECT) {
+        if ((obj._flags & T_NUMBER) || (obj._flags & T_STRING)) {
+          throw RubyTypeError.$new("can't define singleton");
+        }
       }
 
-      if (LOADER_CACHE[resolved]) {
-        return false;
+      if ((obj._klass._flags & FL_SINGLETON) && obj._klass.__attached__ == obj) {
+        klass = obj._klass;
       }
+      else {
+        var class_id = obj._klass._name;
 
-      LOADER_CACHE[resolved] = true;
-      FEATURES.push(resolved);
-      $opal.FILE = resolved;
-      FACTORIES[resolved]();
+        klass = make_metaclass(obj, obj._klass);
+      }
 
-      return true;
+      return klass;
     }
   end
 
-  def respond_to?(name)
-    `!!this[mid_to_jsid(name)]`
-  end
-
-  def singleton_class
-    `singleton_class(this)`
-  end
-
   def tap(&block)
     %x{
-      if (block === nil) {
-        raise(RubyLocalJumpError, 'no block given');
+      if (block === null) {
+        throw RubyLocalJumpError.$new('no block given');
       }
 
-      if ($yield.call($context, this) === breaker) {
-        return breaker.$v;
+      if (block.call(__context, this) === __breaker) {
+        return __breaker.$v;
       }
 
       return this;
@@ -237,6 +253,6 @@ module Kernel
   end
 
   def to_s
-    `return "#<" + class_real(this.$klass).$name + ":0x" + (this.$id * 400487).toString(16) + ">";`
+    `return "#<" + class_real(this._klass)._name + ":0x" + (this._id * 400487).toString(16) + ">";`
   end
 end