opal 0.4.3 → 0.4.4

data/corelib/class.rb

@@ -0,0 +1,47 @@
+class Class
+  def self.new(sup = Object, &block)
+    %x{
+      function AnonClass(){};
+      var klass   = Opal.boot(sup, AnonClass)
+      klass._name = nil;
+      klass._scope = sup._scope;
+
+      sup.$inherited(klass);
+
+      if (block !== nil) {
+        var block_self = block._s;
+        block._s = null;
+        block.call(klass);
+        block._s = block_self;
+      }
+
+      return klass;
+    }
+  end
+
+  def allocate
+    %x{
+      var obj = new #{self}._alloc;
+      obj._id = Opal.uid();
+      return obj;
+    }
+  end
+
+  def inherited(cls)
+  end
+
+  def new(*args, &block)
+    %x{
+      var obj = #{allocate};
+      obj._id = Opal.uid();
+
+      obj.$initialize._p = block;
+      obj.$initialize.apply(obj, args);
+      return obj;
+    }
+  end
+
+  def superclass
+    `#{self}._super || nil`
+  end
+end

data/corelib/{opal/enumerable.rb → enumerable.rb}

@@ -6,30 +6,27 @@ module Enumerable
       if (block !== nil) {
         proc = function(obj) {
           var value;
-          var args = [];
-          for(var i = 0; i < arguments.length; i ++) {
-            args[i] = arguments[i];
-          }
+          var args = $slice.call(arguments);
 
-          if ((value = block.apply(#{self}, args)) === __breaker) {
-            return __breaker.$v;
+          if ((value = block.apply(#{self}, args)) === $breaker) {
+            return $breaker.$v;
           }
 
           if (value === false || value === nil) {
             result = false;
-            __breaker.$v = nil;
+            $breaker.$v = nil;
 
-            return __breaker;
+            return $breaker;
           }
         }
       }
       else {
         proc = function(obj) {
           if ((obj === false || obj === nil) && arguments.length < 2) {
-            result = false;
-            __breaker.$v = nil;
+            result       = false;
+            $breaker.$v = nil;
 
-            return __breaker;
+            return $breaker;
           }
         }
       }
@@ -48,20 +45,17 @@ module Enumerable
       if (block !== nil) {
         proc = function(obj) {
           var value;
-          var args = [];
-          for(var i = 0; i < arguments.length; i ++) {
-            args[i] = arguments[i];
-          }
+          var args = $slice.call(arguments);
 
-          if ((value = block.apply(#{self}, args)) === __breaker) {
-            return __breaker.$v;
+          if ((value = block.apply(#{self}, args)) === $breaker) {
+            return $breaker.$v;
           }
 
           if (value !== false && value !== nil) {
             result       = true;
-            __breaker.$v = nil;
+            $breaker.$v = nil;
 
-            return __breaker;
+            return $breaker;
           }
         }
       }
@@ -69,9 +63,9 @@ module Enumerable
         proc = function(obj) {
           if ((obj !== false && obj !== nil) || arguments.length >= 2) {
             result      = true;
-            __breaker.$v = nil;
+            $breaker.$v = nil;
 
-            return __breaker;
+            return $breaker;
           }
         }
       }
@@ -84,14 +78,16 @@ module Enumerable
   end
 
   def collect(&block)
+    return enum_for :collect unless block_given?
+
     %x{
       var result = [];
 
       var proc = function() {
-        var obj = __slice.call(arguments), value;
+        var value, args = $slice.call(arguments);
 
-        if ((value = block.apply(nil, obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block.apply(null, arguments)) === $breaker) {
+          return $breaker.$v;
         }
 
         result.push(value);
@@ -109,13 +105,13 @@ module Enumerable
       var result = #{object} == undefined ? 0 : #{object};
 
       var proc = function() {
-        var obj = __slice.call(arguments), value;
+        var obj = $slice.call(arguments), value;
 
-        if ((value = block.apply(nil, [result].concat(obj))) === __breaker) {
-          result = __breaker.$v;
-          __breaker.$v = nil;
+        if ((value = block.apply(nil, [result].concat(obj))) === $breaker) {
+          result = $breaker.$v;
+          $breaker.$v = nil;
 
-          return __breaker;
+          return $breaker;
         }
 
         result = value;
@@ -133,17 +129,22 @@ module Enumerable
       var result = 0;
 
       if (object != null) {
-        block = function(obj) { return #{ `obj` == `object` }; };
+        block = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
+
+          return #{ `param` == `object` };
+        };
       }
       else if (block === nil) {
         block = function() { return true; };
       }
 
-      var proc = function(obj) {
-        var value;
+      var proc = function() {
+        var value, param = $slice.call(arguments);
 
-        if ((value = block(obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block.apply(null, param)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
@@ -162,18 +163,20 @@ module Enumerable
     %x{
       var result = nil;
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each._p = function() {
         var value;
+        var param = arguments.length == 1 ?
+          arguments[0] : $slice.call(arguments);
 
-        if ((value = block(obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(param)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          result      = obj;
-          __breaker.$v = nil;
+          result       = param;
+          $breaker.$v = nil;
 
-          return __breaker;
+          return $breaker;
         }
       };
 
@@ -184,7 +187,7 @@ module Enumerable
       }
 
       if (typeof(ifnone) === 'function') {
-        return #{ ifnone.call };
+        return #{ifnone.call};
       }
 
       return ifnone == null ? nil : ifnone;
@@ -196,7 +199,7 @@ module Enumerable
       var result  = [],
           current = 0;
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each._p = function() {
         if (number < current) {
           result.push(e);
         }
@@ -214,19 +217,21 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each._p = function() {
         var value;
+        var param = arguments.length == 1 ?
+          arguments[0] : $slice.call(arguments);
 
-        if ((value = block(obj)) === __breaker) {
-          return __breaker;
+        if ((value = block(param)) === $breaker) {
+          return $breaker;
         }
 
         if (value === false || value === nil) {
-          result.push(obj);
+          result.push(param);
           return value;
         }
 
-        return __breaker;
+        return $breaker;
       };
 
       #{self}.$each();
@@ -239,8 +244,11 @@ module Enumerable
     %x{
       var all = [];
 
-      #{self}.$each._p = function(obj) {
-        all.push(obj);
+      #{self}.$each._p = function() {
+        var param = arguments.length == 1 ?
+          arguments[0] : $slice.call(arguments);
+
+        all.push(param);
 
         if (all.length == n) {
           block(all.slice(0));
@@ -263,11 +271,13 @@ module Enumerable
     %x{
       var index = 0;
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each._p = function() {
         var value;
+        var param = arguments.length == 1 ?
+          arguments[0] : $slice.call(arguments);
 
-        if ((value = block(obj, index)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(param, index)) === $breaker) {
+          return $breaker.$v;
         }
 
         index++;
@@ -280,11 +290,13 @@ module Enumerable
 
   def each_with_object(object, &block)
     %x{
-      #{self}.$each._p = function(obj) {
+      #{self}.$each._p = function() {
         var value;
+        var param = arguments.length == 1 ?
+          arguments[0] : $slice.call(arguments);
 
-        if ((value = block(obj, object)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(param, object)) === $breaker) {
+          return $breaker.$v;
         }
       };
 
@@ -298,8 +310,13 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = function(obj) {
-        result.push(obj);
+      #{self}.$each._p = function() {
+        if (arguments.length == 1) {
+          result.push(arguments[0]);
+        }
+        else {
+          result.push($slice.call(arguments));
+        }
       };
 
       #{self}.$each();
@@ -314,15 +331,17 @@ module Enumerable
     %x{
       var result = [];
 
-      #{self}.$each._p = function(obj) {
+      #{self}.$each._p = function() {
         var value;
+        var param = arguments.length == 1 ?
+          arguments[0] : $slice.call(arguments);
 
-        if ((value = block(obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(param)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          result.push(obj);
+          result.push(param);
         }
       };
 
@@ -337,28 +356,35 @@ module Enumerable
       var proc, result = nil, index = 0;
 
       if (object != null) {
-        proc = function (obj) {
-          if (#{ `obj` == `object` }) {
+        proc = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
+
+          if (#{ `param` == `object` }) {
             result = index;
-            return __breaker;
+            return $breaker;
           }
+
           index += 1;
         };
       }
       else {
-        proc = function(obj) {
+        proc = function() {
           var value;
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
 
-          if ((value = block(obj)) === __breaker) {
-            return __breaker.$v;
+          if ((value = block(param)) === $breaker) {
+            return $breaker.$v;
           }
 
           if (value !== false && value !== nil) {
-            result     = index;
-            __breaker.$v = index;
+            result       = index;
+            $breaker.$v = index;
 
-            return __breaker;
+            return $breaker;
           }
+
           index += 1;
         };
       }
@@ -372,25 +398,32 @@ module Enumerable
 
   def first(number = undefined)
     %x{
-      var result = [],
+      var result  = [],
           current = 0,
           proc;
 
       if (number == null) {
         result = nil;
-        proc = function(obj) {
-            result = obj; return __breaker;
-          };
-      } else {
-        proc = function(obj) {
-            if (number <= current) {
-              return __breaker;
-            }
+        proc   = function() {
+          result = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
 
-            result.push(obj);
+          return $breaker;
+        };
+      }
+      else {
+        proc = function() {
+          if (number <= current) {
+            return $breaker;
+          }
+
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
 
-            current++;
-          };
+          result.push(param);
+
+          current++;
+        };
       }
 
       #{self}.$each._p = proc;
@@ -402,28 +435,39 @@ module Enumerable
 
   def grep(pattern, &block)
     %x{
-      var result = [];
+      var result = [],
+          proc;
 
-      #{self}.$each._p = (block !== nil
-        ? function(obj) {
-            var value = #{pattern === `obj`};
+      if (block !== nil) {
+        proc = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
 
-            if (value !== false && value !== nil) {
-              if ((value = block(obj)) === __breaker) {
-                return __breaker.$v;
-              }
+          var value = #{pattern === `param`};
 
-              result.push(value);
+          if (value !== false && value !== nil) {
+            if ((value = block(param)) === $breaker) {
+              return $breaker.$v;
             }
+
+            result.push(value);
           }
-        : function(obj) {
-            var value = #{pattern === `obj`};
+        };
+      }
+      else {
+        proc = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
 
-            if (value !== false && value !== nil) {
-              result.push(obj);
-            }
-          });
+          var value = #{pattern === `param`};
 
+          if (value !== false && value !== nil) {
+            result.push(param);
+          }
+        };
+      }
+
+      #{self}.$each._p = proc;
       #{self}.$each();
 
       return result;
@@ -446,32 +490,44 @@ module Enumerable
     %x{
       var proc, result;
       var arg_error = false;
+
       if (block !== nil) {
-        proc = function(obj) {
+        proc = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
+
           if (result == undefined) {
-            result = obj;
+            result = param;
           }
-          else if ((value = block(obj, result)) === __breaker) {
-            result = __breaker.$v;
-            return __breaker;
+          else if ((value = block(param, result)) === $breaker) {
+            result = $breaker.$v;
+
+            return $breaker;
           }
           else {
             if (value > 0) {
-              result = obj;
+              result = param;
             }
-            __breaker.$v = nil;
+
+            $breaker.$v = nil;
           }
         }
       }
       else {
-        proc = function(obj) {
-          var modules = obj.$class().$included_modules;
+        proc = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
+
+          var modules = param.$class().$included_modules;
+
           if (modules == undefined || modules.length == 0 || modules.indexOf(Opal.Comparable) == -1) {
             arg_error = true;
-            return __breaker;
+
+            return $breaker;
           }
-          if (result == undefined || obj > result) {
-            result = obj;
+
+          if (result == undefined || #{`param` > `result`}) {
+            result = param;
           }
         }
       }
@@ -489,34 +545,47 @@ module Enumerable
 
   def min(&block)
     %x{
-      var proc, result;
-      var arg_error = false;
+      var proc,
+          result,
+          arg_error = false;
+
       if (block !== nil) {
-        proc = function(obj) {
+        proc = function() {
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
+
           if (result == undefined) {
-            result = obj;
+            result = param;
           }
-          else if ((value = block(obj, result)) === __breaker) {
-            result = __breaker.$v;
-            return __breaker;
+          else if ((value = block(param, result)) === $breaker) {
+            result = $breaker.$v;
+
+            return $breaker;
           }
           else {
             if (value < 0) {
-              result = obj;
+              result = param;
             }
-            __breaker.$v = nil;
+
+            $breaker.$v = nil;
           }
         }
       }
       else {
         proc = function(obj) {
-          var modules = obj.$class().$included_modules;
+          var param = arguments.length == 1 ?
+            arguments[0] : $slice.call(arguments);
+
+          var modules = param.$class().$included_modules;
+
           if (modules == undefined || modules.length == 0 || modules.indexOf(Opal.Comparable) == -1) {
             arg_error = true;
-            return __breaker;
+
+            return $breaker;
           }
-          if (result == undefined || obj < result) {
-            result = obj;
+
+          if (result == undefined || #{`param` < `result`}) {
+            result = param;
           }
         }
       }
@@ -528,49 +597,47 @@ module Enumerable
         #{raise ArgumentError, "Array#min"};
       }
 
-      return (result == undefined ? nil : result);
+      return result == undefined ? nil : result;
     }
   end
 
   def none?(&block)
     %x{
-      var result = true, proc;
+      var result = true,
+          proc;
 
       if (block !== nil) {
         proc = function(obj) {
-          var value;
-          var args = [];
-          for(var i = 0; i < arguments.length; i ++) {
-            args[i] = arguments[i];
-          }
+          var value,
+              args = $slice.call(arguments);
 
-          if ((value = block.apply(#{self}, args)) === __breaker) {
-            return __breaker.$v;
+          if ((value = block.apply(#{self}, args)) === $breaker) {
+            return $breaker.$v;
           }
 
           if (value !== false && value !== nil) {
-            result = false;
-            __breaker.$v = nil;
+            result       = false;
+            $breaker.$v = nil;
 
-            return __breaker;
+            return $breaker;
           }
         }
       }
       else {
         proc = function(obj) {
           if (arguments.length == 1 && (obj !== false && obj !== nil)) {
-            result = false;
-            __breaker.$v = nil;
+            result       = false;
+            $breaker.$v = nil;
 
-            return __breaker;
+            return $breaker;
           }
           else {
             for (var i = 0, length = arguments.length; i < length; i++) {
               if (arguments[i] !== false && arguments[i] !== nil) {
-                result = false;
-                __breaker.$v = nil;
+                result       = false;
+                $breaker.$v = nil;
 
-                return __breaker;
+                return $breaker;
               }
             }
           }
@@ -584,7 +651,7 @@ module Enumerable
     }
   end
 
-  def sort_by &block
+  def sort_by(&block)
     map { |*f|
       # FIXME: this should probably belongs to somewhere more
       f = `#{f}.length === 1 ? #{f}[0] : #{f}`