opal 0.3.31 → 0.3.32

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2012 by Adam Beynon
+Copyright (C) 2013 by Adam Beynon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -47,7 +47,7 @@ to allow compilation in any javascript environment.
 
 ## License
 
-Copyright (C) 2012 by Adam Beynon
+Copyright (C) 2013 by Adam Beynon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/core/array.rb

@@ -1,6 +1,6 @@
 class Array < `Array`
   %x{
-    Array_prototype._isArray = true;
+    Array.prototype._isArray = true;
   }
 
   include Enumerable
@@ -695,7 +695,7 @@ class Array < `Array`
     self
   end
 
-  def rindex(object, &block)
+  def rindex(object = undefined, &block)
     %x{
       if (block !== nil) {
         for (var i = #{self}.length - 1, value; i >= 0; i--) {
@@ -911,4 +911,26 @@ class Array < `Array`
       return result;
     }
   end
+
+  def sort(&block)
+    %x{
+      var copy = #{self}.slice();
+
+      if (block !== nil) {
+        return copy.sort(block);
+      }
+
+      return copy.sort();
+    }
+  end
+
+  def sort!(&block)
+    %x{
+      if (block !== nil) {
+        return #{self}.sort(block);
+      }
+
+      return #{self}.sort();
+    }
+  end
 end

data/core/basic_object.rb

@@ -0,0 +1,49 @@
+class BasicObject
+  def initialize(*)
+  end
+
+  def ==(other)
+    `#{self} === other`
+  end
+
+  def __send__(symbol, *args, &block)
+    %x{
+      return #{self}['$' + symbol].apply(#{self}, args);
+    }
+  end
+
+  alias eql? ==
+  alias equal? ==
+
+  def instance_eval(&block)
+    %x{
+      if (block === nil) {
+        no_block_given();
+      }
+
+      var block_self = block._s, result;
+
+      block._s = null;
+      result = block.call(#{self}, #{self});
+      block._s = block_self;
+
+      return result;
+    }
+  end
+
+  def instance_exec(*args, &block)
+    %x{
+      if (block === nil) {
+        no_block_given();
+      }
+
+      var block_self = block._s, result;
+
+      block._s = null;
+      result = block.apply(#{self}, args);
+      block._s = block_self;
+
+      return result;
+    }
+  end
+end

data/core/boolean.rb

@@ -1,6 +1,6 @@
 class Boolean < `Boolean`
   %x{
-    Boolean_prototype._isBoolean = true;
+    Boolean.prototype._isBoolean = true;
   }
 
   def &(other)
@@ -28,4 +28,4 @@ class Boolean < `Boolean`
   def to_s
     `(#{self} == true) ? 'true' : 'false'`
   end
-end
+end

data/core/class.rb

@@ -178,11 +178,11 @@ class Class
     `#{self}._name`
   end
 
-  def new(*args, &block)
+  def new()
     %x{
+      var args = __slice.call(arguments);
       var obj = new #{self};
       obj._id = unique_id++;
-      obj.$initialize._p  = block;
 
       obj.$initialize.apply(obj, args);
       return obj;

data/core/enumerable.rb

@@ -30,8 +30,7 @@ module Enumerable
         }
       }
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
@@ -68,8 +67,7 @@ module Enumerable
         }
       }
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
@@ -89,14 +87,13 @@ module Enumerable
         result.push(value);
       };
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
   end
 
-  def reduce(object, &block)
+  def reduce(object = undefined, &block)
     %x{
       var result = #{object} == undefined ? 0 : #{object};
 
@@ -113,14 +110,13 @@ module Enumerable
         result = value;
       };
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
   end
 
-  def count(object, &block)
+  def count(object = undefined, &block)
     %x{
       var result = 0;
 
@@ -143,18 +139,17 @@ module Enumerable
         }
       }
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
   end
 
-  def detect(ifnone, &block)
+  def detect(ifnone = undefined, &block)
     %x{
       var result = nil;
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         var value;
 
         if ((value = block(obj)) === __breaker) {
@@ -167,9 +162,7 @@ module Enumerable
 
           return __breaker;
         }
-      };
-
-      #{self}.$each();
+      });
 
       if (result !== nil) {
         return result;
@@ -188,15 +181,13 @@ module Enumerable
       var result  = [],
           current = 0;
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         if (number < current) {
           result.push(e);
         }
 
         current++;
-      };
-
-      #{self}.$each();
+      });
 
       return result;
     }
@@ -206,7 +197,7 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         var value;
 
         if ((value = block(obj)) === __breaker) {
@@ -218,11 +209,8 @@ module Enumerable
           return value;
         }
 
-
         return __breaker;
-      };
-
-      #{self}.$each();
+      });
 
       return result;
     }
@@ -232,7 +220,7 @@ module Enumerable
     %x{
       var index = 0;
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         var value;
 
         if ((value = block(obj, index)) === __breaker) {
@@ -240,9 +228,7 @@ module Enumerable
         }
 
         index++;
-      };
-
-      #{self}.$each();
+      });
 
       return nil;
     }
@@ -250,15 +236,13 @@ module Enumerable
 
   def each_with_object(object, &block)
     %x{
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         var value;
 
         if ((value = block(obj, object)) === __breaker) {
           return __breaker.$v;
         }
-      };
-
-      #{self}.$each();
+      });
 
       return object;
     }
@@ -268,11 +252,9 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         result.push(obj);
-      };
-
-      #{self}.$each();
+      });
 
       return result;
     }
@@ -284,7 +266,7 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each(function(obj) {
         var value;
 
         if ((value = block(obj)) === __breaker) {
@@ -294,15 +276,13 @@ module Enumerable
         if (value !== false && value !== nil) {
           result.push(obj);
         }
-      };
-
-      #{self}.$each();
+      });
 
       return result;
     }
   end
 
-  def find_index(object, &block)
+  def find_index(object = undefined, &block)
     %x{
       var proc, result = nil, index = 0;
 
@@ -333,14 +313,13 @@ module Enumerable
         };
       }
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
   end
 
-  def first(number)
+  def first(number = undefined)
     %x{
       var result = [],
           current = 0,
@@ -363,8 +342,7 @@ module Enumerable
           };
       }
 
-      #{self}.$each._p = proc;
-      #{self}.$each();
+      #{self}.$each(proc);
 
       return result;
     }
@@ -374,7 +352,7 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = (block !== nil
+      #{self}.$each(block !== nil
         ? function(obj) {
             var value = #{pattern === `obj`};
 
@@ -394,8 +372,6 @@ module Enumerable
             }
           });
 
-      #{self}.$each();
-
       return result;
     }
   end

data/core/hash.rb

@@ -28,8 +28,9 @@ class Hash
     // 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(map) {
+    __hash2 = Opal.hash2 = function(keys, map) {
       var hash = new Hash;
+      hash.keys = keys;
       hash.map = map;
       return hash;
     }
@@ -45,9 +46,10 @@ 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) {
+        keys.push(key);
         map[key] = obj[key];
       }
 
@@ -55,7 +57,7 @@ class Hash
     }
   end
 
-  def self.new(defaults, &block)
+  def self.new(defaults = undefined, &block)
     %x{
       var hash = __hash();
 
@@ -76,15 +78,19 @@ class Hash
         return true;
       }
 
-      if (other.map == null) {
+      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 key in map) {
-        var obj = map[key], obj2 = map2[key];
+      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;
@@ -97,10 +103,10 @@ class Hash
 
   def [](key)
     %x{
-      var obj = #{self}.map[key];
+      var bucket = #{self}.map[key];
 
-      if (obj != null) {
-        return obj;
+      if (bucket != null) {
+        return bucket;
       }
 
       var proc = #{@proc};
@@ -115,18 +121,27 @@ class Hash
 
   def []=(key, value)
     %x{
-      #{self}.map[key] = value;
+      var map = #{self}.map;
+
+      if (!__hasOwn.call(map, key)) {
+        #{self}.keys.push(key);
+      }
+
+      map[key] = value;
+
       return value;
     }
   end
 
   def assoc(object)
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys, key;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        key = keys[i];
 
-      for (var key in map) {
         if (#{`key` == object}) {
-          return [key, map[key]];
+          return [key, #{self}.map[key]];
         }
       }
 
@@ -137,6 +152,7 @@ class Hash
   def clear
     %x{
       #{self}.map = {};
+      #{self}.keys = [];
       return #{self};
     }
   end
@@ -145,10 +161,12 @@ class Hash
     %x{
       var result = __hash(),
           map    = #{self}.map,
-          map2   = result.map;
+          map2   = result.map,
+          keys2  = result.keys;
 
-      for (var key in map) {
-        map2[key] = map[key];
+      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;
@@ -173,10 +191,12 @@ class Hash
 
   def delete(key)
     %x{
-      var map = #{self}.map, result = map[key];
+      var map  = #{self}.map, result = map[key];
 
       if (result != null) {
         delete map[key];
+        #{self}.keys.$delete(key);
+
         return result;
       }
 
@@ -186,15 +206,21 @@ class Hash
 
   def delete_if(&block)
     %x{
-      var map = #{self}.map, value;
+      var map = #{self}.map, keys = #{self}.keys, value;
 
-      for (var key in map) {
-        if ((value = block(key, map[key])) === __breaker) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
+
+        if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          delete map[key]
+          keys.splice(i, 1);
+          delete map[key];
+
+          length--;
+          i--;
         }
       }
 
@@ -206,9 +232,11 @@ class Hash
 
   def each(&block)
     %x{
-      var map = #{self}.map;
+      var map = #{self}.map, keys = #{self}.keys;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-      for (var key in map) {
         if (block(key, map[key]) === __breaker) {
           return __breaker.$v;
         }
@@ -220,9 +248,11 @@ class Hash
 
   def each_key(&block)
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-      for (var key in map) {
         if (block(key) === __breaker) {
           return __breaker.$v;
         }
@@ -236,10 +266,10 @@ class Hash
 
   def each_value(&block)
     %x{
-      var map = #{self}.map;
+      var map = #{self}.map, keys = #{self}.keys;
 
-      for (var key in map) {
-        if (block(map[key]) === __breaker) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        if (block(map[keys[i]]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -250,17 +280,13 @@ class Hash
 
   def empty?
     %x{
-      for (var key in #{self}.map) {
-        return false;
-      }
-
-      return true;
+      return #{self}.keys.length === 0;
     }
   end
 
   alias eql? ==
 
-  def fetch(key, defaults, &block)
+  def fetch(key, defaults = undefined, &block)
     %x{
       var value = #{self}.map[key];
 
@@ -288,10 +314,10 @@ class Hash
 
   def flatten(level=undefined)
     %x{
-      var map = #{self}.map, result = [];
+      var map = #{self}.map, keys = #{self}.keys, result = [];
 
-      for (var key in map) {
-        var value = map[key];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], value = map[key];
 
         result.push(key);
 
@@ -318,10 +344,8 @@ class Hash
 
   def has_value?(value)
     %x{
-      var map = #{self}.map;
-
-      for (var key in map) {
-        if (#{`map[key]` == value}) {
+      for (var assoc in #{self}.map) {
+        if (#{`#{self}.map[assoc]` == value}) {
           return true;
         }
       }
@@ -338,9 +362,11 @@ class Hash
 
   def index(object)
     %x{
-      var map = #{self}.map;
+      var map = #{self}.map, keys = #{self}.keys;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
 
-      for (var key in map) {
         if (#{object == `map[key]`}) {
           return key;
         }
@@ -355,13 +381,13 @@ class Hash
       var result = [], map = #{self}.map, val;
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        val = map[keys[i]];
+        var key = keys[i], val = map[key];
 
         if (val != null) {
           result.push(val);
         }
         else {
-          result.push(#{@none});
+          result.push(#{self}.none);
         }
       }
 
@@ -373,9 +399,10 @@ class Hash
 
   def inspect
     %x{
-      var inspect = [], map = #{self}.map;
+      var inspect = [], keys = #{self}.keys, map = #{self}.map;
 
-      for (var key in map) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
         inspect.push(#{`key`.inspect} + '=>' + #{`map[key]`.inspect});
       }
 
@@ -385,10 +412,13 @@ class Hash
 
   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 key in map) {
-        var obj = map[key];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
+
+        keys2.push(obj);
         map2[obj] = key;
       }
 
@@ -398,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 key in map) {
-        var obj = map[key];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
+          keys.splice(i, 1);
           delete map[key];
+
+          length--;
+          i--;
         }
       }
 
@@ -422,25 +456,13 @@ class Hash
 
   def keys
     %x{
-      var result = [], map = #{self}.map;
-
-      for (var key in map) {
-        result.push(key);
-      }
-
-      return result;
+      return #{self}.keys.slice(0);
     }
   end
 
   def length
     %x{
-      var length = 0, map = #{self}.map;
-
-      for (var key in map) {
-        length++;
-      }
-
-      return length;
+      return #{self}.keys.length;
     }
   end
 
@@ -448,22 +470,35 @@ class Hash
 
   def merge(other, &block)
     %x{
-      var map = #{self}.map, result = __hash(), map2 = result.map;
+      var keys = #{self}.keys, map = #{self}.map,
+          result = __hash(), keys2 = result.keys, map2 = result.map;
 
-      for (var key in map) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
+
+        keys2.push(key);
         map2[key] = map[key];
       }
 
-      map = other.map;
+      var keys = other.keys, map = other.map;
 
       if (block === nil) {
-        for (key in map) {
+        for (var i = 0, length = keys.length; i < length; i++) {
+          var key = keys[i];
+
+          if (map2[key] == null) {
+            keys2.push(key);
+          }
+
           map2[key] = map[key];
         }
       }
       else {
-        for (key in map) {
+        for (var i = 0, length = keys.length; i < length; i++) {
+          var key = keys[i];
+
           if (map2[key] == null) {
+            keys2.push(key);
             map2[key] = map[key];
           }
           else {
@@ -478,16 +513,26 @@ 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 key in map2) {
+        for (var i = 0, length = keys2.length; i < length; i++) {
+          var key = keys2[i];
+
+          if (map[key] == null) {
+            keys.push(key);
+          }
+
           map[key] = map2[key];
         }
       }
       else {
-        for (key in map2) {
+        for (var i = 0, length = keys2.length; i < length; i++) {
+          var key = keys2[i];
+
           if (map[key] == null) {
+            keys.push(key);
             map[key] = map2[key];
           }
           else {
@@ -502,10 +547,10 @@ class Hash
 
   def rassoc(object)
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys, map = #{self}.map;
 
-      for (var key in map) {
-        var obj = map[key];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
         if (#{`obj` == object}) {
           return [key, obj];
@@ -518,16 +563,18 @@ 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 key in map) {
-        var obj = map[key], value;
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key], value;
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
+          keys2.push(key);
           map2[key] = obj;
         }
       }
@@ -538,10 +585,12 @@ class Hash
 
   def replace(other)
     %x{
-      var map = #{self}.map = {}, map2 = other.map;
+      var map = #{self}.map = {}, keys = #{self}.keys = [];
 
-      for (var key in map2) {
-        map[key] = map2[key];
+      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};
@@ -550,16 +599,18 @@ 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 key in map) {
-        var obj = map[key], value;
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key], value;
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
+          keys2.push(key);
           map2[key] = obj;
         }
       }
@@ -570,18 +621,21 @@ class Hash
 
   def select!(&block)
     %x{
-      var map = #{self}.map, value, result = nil;
+      var map = #{self}.map, keys = #{self}.keys, value, result = nil;
 
-      for (var key in map) {
-        var obj = map[key];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
         if ((value = block(key, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value === false || value === nil) {
+          keys.splice(i, 1);
           delete map[key];
 
+          length--;
+          i--;
           result = #{self}
         }
       }
@@ -592,11 +646,14 @@ class Hash
 
   def shift
     %x{
-      var map = #{self}.map;
+      var keys = #{self}.keys, map = #{self}.map;
+
+      if (keys.length) {
+        var key = keys[0], obj = map[key];
 
-      for (var key in map) {
-        var obj = map[key];
         delete map[key];
+        keys.splice(0, 1);
+
         return [key, obj];
       }
 
@@ -608,9 +665,10 @@ class Hash
 
   def to_a
     %x{
-      var map = #{self}.map, result = [];
+      var keys = #{self}.keys, map = #{self}.map, result = [];
 
-      for (var key in map) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
         result.push([key, map[key]]);
       }
 
@@ -624,9 +682,10 @@ class Hash
 
   def to_json
     %x{
-      var inspect = [], map = #{self}.map;
+      var inspect = [], keys = #{self}.keys, map = #{self}.map;
 
-      for (var key in map) {
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
         inspect.push(#{`key`.to_json} + ': ' + #{`map[key]`.to_json});
       }
 
@@ -636,10 +695,10 @@ class Hash
 
   def to_native
     %x{
-      var result = {}, map = #{self}.map;
+      var result = {}, keys = #{self}.keys, map = #{self}.map, bucket, value;
 
-      for (var key in map) {
-        var obj = map[key];
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i], obj = map[key];
 
         if (obj.$to_native) {
           result[key] = #{`obj`.to_native};
@@ -687,4 +746,3 @@ class Hash
     }
   end
 end
-