opal 0.3.16 → 0.3.17

data/core/basic_object.rb

@@ -8,7 +8,8 @@ class BasicObject
 
   def __send__(symbol, *args, &block)
     %x{
-      var meth = this[mid_to_jsid(symbol)] || $opal.mm(mid_to_jsid(symbol));
+      var meth = this[mid_to_jsid(symbol)] || opal.mm(mid_to_jsid(symbol));
+      args.unshift(block);
 
       return meth.apply(this, args);
     }
@@ -19,20 +20,20 @@ class BasicObject
   alias eql? ==
   alias equal? ==
 
-  def instance_eval(string = nil, &block)
+  def instance_eval(string, &block)
     %x{
-      if (block === nil) {
-        raise(RubyArgError, 'block not supplied');
+      if (block == null) {
+        throw RubyArgError.$new('block not supplied');
       }
 
-      return block.call(this, this);
+      return block.call(this, null, this);
     }
   end
 
   def instance_exec(*args, &block)
     %x{
-      if (block === nil) {
-        raise(RubyArgError, 'block not supplied');
+      if (block == null) {
+        throw RubyArgError.$new('block not supplied');
       }
 
       return block.apply(this, args);
@@ -40,7 +41,8 @@ class BasicObject
   end
 
   def method_missing(symbol, *args)
-    `throw RubyNoMethodError.$new('undefined method \`' + symbol + '\` for ' + #{inspect});`
+    `throw RubyNoMethodError.$new(null, 'undefined method \`' + symbol + '\` for ' + #{inspect});`
+
     self
   end
 

data/core/boolean.rb

@@ -19,6 +19,8 @@ class Boolean
     `(this == true) ? #{TrueClass} : #{FalseClass}`
   end
 
+  alias singleton_class class
+
   def to_s
     `(this == true) ? 'true' : 'false'`
   end

data/core/class.rb

@@ -1,14 +1,18 @@
 class Class
   def self.new(sup = Object, &block)
     %x{
-      var klass       = boot_class(sup);
-          klass.$name = "AnonClass";
+      var klass        = boot_class(sup);
+          klass._name = "AnonClass";
 
-      make_metaclass(klass, sup.$klass);
+      make_metaclass(klass, sup._klass);
 
       #{sup.inherited `klass`};
 
-      return block !== nil ? block.call(klass, null) : klass;
+      if (block !== null) {
+        block.call(klass, null);
+      }
+
+      return klass;
     }
   end
 
@@ -17,15 +21,15 @@ class Class
       var prototype = constructor.prototype,
           klass     = this;
 
-      klass.$allocator = constructor;
-      klass.$proto     = prototype;
+      klass._alloc = constructor;
+      klass._proto     = prototype;
 
       bridged_classes.push(klass);
 
-      prototype.$klass = klass;
-      prototype.$flags = T_OBJECT;
+      prototype._klass = klass;
+      prototype._flags  = T_OBJECT;
 
-      var donator = RubyObject.$proto;
+      var donator = RubyObject._proto;
       for (var method in donator) {
         if (donator.hasOwnProperty(method)) {
           if (!prototype[method]) {
@@ -39,7 +43,7 @@ class Class
   end
 
   def allocate
-    `new this.$allocator()`
+    `new this._alloc()`
   end
 
   def new(*args, &block)
@@ -53,14 +57,22 @@ class Class
 
   def superclass
     %x{
-      var sup = this.$s;
+      var sup = this._super;
 
       if (!sup) {
         if (this === RubyObject) {
-          return nil;
+          return null;
         }
 
-        raise(RubyRuntimeError, 'uninitialized class');
+        throw RubyRuntimeError.$new('uninitialized class');
+      }
+
+      while (sup && (sup._flags & T_ICLASS)) {
+        sup = sup._super;
+      }
+
+      if (!sup) {
+        return null;
       }
 
       return sup;

data/core/comparable.rb

@@ -1,25 +1,25 @@
 module Comparable
-  def < (other)
+  def <(other)
     (self <=> other) == -1
   end
 
-  def <= (other)
+  def <=(other)
     (self <=> other) <= 0
   end
 
-  def == (other)
+  def ==(other)
     (self <=> other) == 0
   end
 
-  def > (other)
+  def >(other)
     (self <=> other) == 1
   end
 
-  def >= (other)
+  def >=(other)
     (self <=> other) >= 0
   end
 
-  def between? (min, max)
+  def between?(min, max)
     self > min && self < max
   end
 end

data/core/enumerable.rb

@@ -1,32 +1,36 @@
 module Enumerable
   def all?(&block)
     %x{
-      var result = true;
+      var result = true, proc;
 
-      this.$each.$P = block !== nil
-        ? function(obj) {
-            var value;
+      if (block) {
+        proc = function(obj) {
+          var value;
 
-            if ((value = $yield.call($context, obj)) === $breaker) {
-              return $breaker.$v;
-            }
+          if ((value = block.call(__context, obj)) === __breaker) {
+            return __breaker.$v;
+          }
 
-            if (value === false || value === nil) {
-              result      = false;
-              $breaker.$v = nil;
+          if (value === false || value === nil) {
+            result = false;
+            __breaker.$v = nil;
 
-              return $breaker;
-            }
+            return __breaker;
           }
-        : function(obj) {
-            if (obj === false || obj === nil) {
-              result      = false;
-              $breaker.$v = nil;
+        }
+      }
+      else {
+        proc = function(obj) {
+          if (obj === false || obj === nil) {
+            result = false;
+            __breaker.$v = nil;
 
-              return $breaker;
-            }
-          };
+            return __breaker;
+          }
+        }
+      }
 
+      this.$each._p = proc;
       this.$each();
 
       return result;
@@ -35,32 +39,36 @@ module Enumerable
 
   def any?(&block)
     %x{
-      var result = false;
+      var result = false, proc;
 
-      this.$each.$P = block !== nil
-        ? function(obj) {
-            var value;
+      if (block) {
+        proc = function(obj) {
+          var value;
 
-            if ((value = $yield.call($context, obj)) === $breaker) {
-              return $breaker.$v;
-            }
+          if ((value = block.call(__context, obj)) === __breaker) {
+            return __breaker.$v;
+          }
 
-            if (value !== false && value !== nil) {
-              result      = true;
-              $breaker.$v = nil;
+          if (value !== false && value !== nil) {
+            result       = true;
+            __breaker.$v = nil;
 
-              return $breaker;
-            }
+            return __breaker;
           }
-        : function(obj) {
-            if (obj !== false && obj !== nil) {
-              result      = true;
-              $breaker.$v = nil;
+        }
+      }
+      else {
+        proc = function(obj) {
+          if (obj !== false && obj !== nil) {
+            result      = true;
+            __breaker.$v = nil;
 
-              return $breaker;
-            }
-          };
+            return __breaker;
+          }
+        }
+      }
 
+      this.$each._p = proc;
       this.$each();
 
       return result;
@@ -73,17 +81,17 @@ module Enumerable
     %x{
       var result = [];
 
-      this.$each.$P = function () {
-        var obj = $slice.call(arguments),
-            value;
+      var proc = function() {
+        var obj = __slice.call(arguments), value;
 
-        if ((value = $yield.apply($context, obj)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.apply(__context, obj)) === __breaker) {
+          return __breaker.$v;
         }
 
         result.push(value);
       };
 
+      this.$each._p = proc;
       this.$each();
 
       return result;
@@ -94,27 +102,28 @@ module Enumerable
     %x{
       var result = 0;
 
-      if (block === nil) {
-        if (object === undefined) {
-          $yield = function() { return true; };
+      if (!block) {
+        if (object == null) {
+          block = function() { return true; };
         }
         else {
-          $yield = function(obj) { return #{`obj` == `object`}; };
+          block = function(obj) { return #{`obj` == `object`}; };
         }
       }
 
-      this.$each.$P = function(obj) {
+      var proc = function(obj) {
         var value;
 
-        if ((value = $yield.call($context, obj)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, obj)) === __breaker) {
+          return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
           result++;
         }
-      };
+      }
 
+      this.$each._p = proc;
       this.$each();
 
       return result;
@@ -127,10 +136,10 @@ module Enumerable
     %x{
       var result = nil;
 
-      this.$each.$P = function(obj) {
+      this.$each(function(y, obj) {
         var value;
 
-        if ((value = $yield.call($context, obj)) === $breaker) {
+        if ((value = $yield.call($context, null, obj)) === $breaker) {
           return $breaker.$v;
         }
 
@@ -140,9 +149,7 @@ module Enumerable
 
           return $breaker;
         }
-      };
-
-      this.$each();
+      });
 
       if (result !== nil) {
         return result;
@@ -163,15 +170,13 @@ module Enumerable
       var result  = [],
           current = 0;
 
-      this.$each.$P = function(obj) {
+      this.$each(function(y, obj) {
         if (number < current) {
           result.push(e);
         }
 
         current++;
-      };
-
-      this.$each();
+      });
 
       return result;
     }
@@ -183,10 +188,10 @@ module Enumerable
     %x{
       var result = [];
 
-      this.$each.$P = function(obj) {
+      this.$each.$P = function(y, obj) {
         var value;
 
-        if ((value = $yield.call($context, obj)) === $breaker) {
+        if ((value = $yield.call($context, null, obj)) === $breaker) {
           return $breaker.$v;
         }
 
@@ -210,31 +215,28 @@ module Enumerable
     %x{
       var index = 0;
 
-      this.$each.$P = function(obj) {
+      this.$each(function(y, obj) {
         var value;
 
-        if ((value = $yield.call($context, obj, index)) === $breaker) {
+        if ((value = $yield.call($context, null, obj, index)) === $breaker) {
           return $breaker.$v;
         }
 
         index++;
-      };
-
-      this.$each();
+      });
 
       return nil;
     }
   end
 
   def entries
-    %x{
-      var result = [];
-
-      this.$each.$P = function(obj) { return result.push(obj); };
-      this.$each();
+    result = []
 
-      return result;
+    each {|*args|
+      result.push args.length == 1 ? args.first : args
     }
+
+    result
   end
 
   alias find detect
@@ -244,15 +246,15 @@ module Enumerable
 
     %x{
       if (object !== undefined) {
-        $yield = function (iter, obj) { return obj.$eq$(object); };
+        $yield = function (y, obj) { return obj.$eq$(null, object); };
       }
 
       var result = nil;
 
-      this.$each_with_index.$P = function(obj, index) {
+      this.$each_with_index(function(y, obj, index) {
         var value;
 
-        if ((value = $yield.call($context, obj)) === $breaker) {
+        if ((value = $yield.call($context, null, obj)) === $breaker) {
           return $breaker.$v;
         }
 
@@ -262,9 +264,7 @@ module Enumerable
 
           return $breaker;
         }
-      };
-
-      this.$each_with_index();
+      });
 
       return result;
     }
@@ -275,11 +275,11 @@ module Enumerable
       var result = [],
           current = 0;
 
-      this.$each.$P = number === undefined
-        ? function(obj) {
+      this.$each(number === undefined
+        ? function(y, obj) {
             result = obj; return $breaker;
           }
-        : function(obj) {
+        : function(y, obj) {
             if (number <= current) {
               return $breaker;
             }
@@ -287,9 +287,7 @@ module Enumerable
             result.push(obj);
 
             current++;
-          };
-
-      this.$each();
+          });
 
       return result;
     }
@@ -299,27 +297,25 @@ module Enumerable
     %x{
       var result = [];
 
-      this.$each.$P = block !== nil
-        ? function(obj) {
-            var value = pattern.$eqq$(obj);
+      this.$each(block !== nil
+        ? function(y, obj) {
+            var value = pattern.$eqq$(null, obj);
 
             if (value !== false && value !== nil) {
-              if ((value = $yield.call($context, obj)) === $breaker) {
+              if ((value = $yield.call($context, null, obj)) === $breaker) {
                 return $breaker.$v;
               }
 
               result.push(obj);
             }
           }
-        : function(obj) {
-            var value = pattern.$eqq$(obj);
+        : function(y, obj) {
+            var value = pattern.$eqq$(null, obj);
 
             if (value !== false && value !== nil) {
               ary.push(obj);
             }
-          };
-
-      this.$each();
+          });
 
       return result;
     }