opal 0.9.4 → 0.10.0.beta1

data/opal/corelib/basic_object.rb

@@ -52,9 +52,13 @@ class BasicObject
 
       string, file, _lineno = *args
       compiled = Opal.compile string, file: (file || '(eval)'), eval: true
-      wrapper  = `function() {return eval(compiled)}`
-
-      block = Kernel.lambda { `wrapper.call(#{self})` }
+      block = Kernel.lambda do
+        %x{
+          return (function(self) {
+            return eval(compiled);
+          })(self)
+        }
+      end
     elsif args.size > 0
       Kernel.raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
     end

data/opal/corelib/class.rb

@@ -1,29 +1,23 @@
 require 'corelib/module'
 
 class Class
-  def self.new(sup = Object, &block)
+  def self.new(superclass = Object, &block)
     %x{
-      if (!sup.$$is_class) {
-        #{raise TypeError, "superclass must be a Class"};
+      if (!superclass.$$is_class) {
+        throw Opal.TypeError.$new("superclass must be a Class");
       }
 
-      function AnonClass(){};
-      var klass        = Opal.boot_class(sup, AnonClass)
-      klass.$$name     = nil;
-      klass.$$parent   = sup;
-      klass.$$is_class = true;
+      var alloc = Opal.boot_class_alloc(null, function(){}, superclass)
+      var klass = Opal.setup_class_object(null, alloc, superclass.$$name, superclass.constructor);
 
-      // inherit scope from parent
-      Opal.create_scope(sup.$$scope, klass);
+      klass.$$super = superclass;
+      klass.$$parent = superclass;
 
-      sup.$inherited(klass);
+      // inherit scope from parent
+      Opal.create_scope(superclass.$$scope, klass);
 
-      if (block !== nil) {
-        var block_self = block.$$s;
-        block.$$s = null;
-        block.call(klass);
-        block.$$s = block_self;
-      }
+      superclass.$inherited(klass);
+      Opal.module_initialize(klass, block);
 
       return klass;
     }

data/opal/corelib/constants.rb

@@ -1,8 +1,8 @@
 RUBY_PLATFORM       = 'opal'
 RUBY_ENGINE         = 'opal'
 RUBY_VERSION        = '2.2.3'
-RUBY_ENGINE_VERSION = '0.9.4'
-RUBY_RELEASE_DATE   = '2016-06-21'
+RUBY_ENGINE_VERSION = '0.10.0.beta1'
+RUBY_RELEASE_DATE   = '2015-12-20'
 RUBY_PATCHLEVEL     = 0
 RUBY_REVISION       = 0
 RUBY_COPYRIGHT      = 'opal - Copyright (C) 2013-2015 Adam Beynon'

data/opal/corelib/enumerable.rb

@@ -1,70 +1,54 @@
 module Enumerable
   def all?(&block)
-    %x{
-      var result = true;
+    result = true
 
-      if (block !== nil) {
-        self.$each.$$p = function() {
-          var value = Opal.yieldX(block, arguments);
+    if block_given?
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
+      each do |*value|
+        unless yield(*value)
+          result = false
+          break
+        end
+      end
 
-          if (#{Opal.falsy?(`value`)}) {
-            result = false;
-            return $breaker;
-          }
-        };
-      }
-      else {
-        self.$each.$$p = function(obj) {
-          if (arguments.length == 1 && #{Opal.falsy?(`obj`)}) {
-            result = false;
-            return $breaker;
-          }
-        };
-      }
+    else
 
-      self.$each();
+      each do |*value|
+        unless Opal.destructure(value)
+          result = false
+          break
+        end
+      end
 
-      return result;
-    }
+    end
+
+    result
   end
 
   def any?(&block)
-    %x{
-      var result = false;
+    result = false
 
-      if (block !== nil) {
-        self.$each.$$p = function() {
-          var value = Opal.yieldX(block, arguments);
+    if block_given?
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
+      each do |*value|
+        if yield(*value)
+          result = true
+          break
+        end
+      end
 
-          if (#{Opal.truthy?(`value`)}) {
-            result = true;
-            return $breaker;
-          }
-        };
-      }
-      else {
-        self.$each.$$p = function(obj) {
-          if (arguments.length != 1 || #{Opal.truthy?(`obj`)}) {
-            result = true;
-            return $breaker;
-          }
-        }
-      }
+    else
 
-      self.$each();
+      each do |*value|
+        if Opal.destructure(value)
+          result = true
+          break
+        end
+      end
 
-      return result;
-    }
+    end
+
+    result
   end
 
   def chunk(state = undefined, &original_block)
@@ -89,10 +73,6 @@ module Enumerable
         self.$each.$$p = function(value) {
           var key = Opal.yield1(block, value);
 
-          if (key === $breaker) {
-            return $breaker;
-          }
-
           if (key === nil) {
             releaseAccumulate();
             accumulate = [];
@@ -125,11 +105,6 @@ module Enumerable
       self.$each.$$p = function() {
         var value = Opal.yieldX(block, arguments);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         result.push(value);
       };
 
@@ -160,11 +135,6 @@ module Enumerable
       self.$each.$$p = function() {
         var value = Opal.yieldX(block, arguments);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         if (#{Opal.truthy?(`value`)}) {
           result++;
         }
@@ -200,11 +170,6 @@ module Enumerable
         var param = #{Opal.destructure(`arguments`)},
             value = Opal.yield1(block, param);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         all.push(param);
       }
 
@@ -222,10 +187,6 @@ module Enumerable
         while (true) {
           for (i = 0, length = all.length; i < length; i++) {
             value = Opal.yield1(block, all[i]);
-
-            if (value === $breaker) {
-              return $breaker.$v;
-            }
           }
         }
       }
@@ -233,10 +194,6 @@ module Enumerable
         while (n > 1) {
           for (i = 0, length = all.length; i < length; i++) {
             value = Opal.yield1(block, all[i]);
-
-            if (value === $breaker) {
-              return $breaker.$v;
-            }
           }
 
           n--;
@@ -247,27 +204,17 @@ module Enumerable
 
   def detect(ifnone = undefined, &block)
     return enum_for :detect, ifnone unless block_given?
+    result = `undefined`
 
-    %x{
-      var result;
-
-      self.$each.$$p = function() {
-        var params = #{Opal.destructure(`arguments`)},
-            value  = Opal.yield1(block, params);
-
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
-        if (#{Opal.truthy?(`value`)}) {
-          result = params;
-          return $breaker;
-        }
-      };
-
-      self.$each();
+    each do |*args|
+      value = Opal.destructure(args)
+      if yield(value)
+        result = value
+        break
+      end
+    end
 
+    %x{
       if (result === undefined && ifnone !== undefined) {
         if (typeof(ifnone) === 'function') {
           result = ifnone();
@@ -319,11 +266,6 @@ module Enumerable
         if (dropping) {
           var value = Opal.yield1(block, param);
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
-
           if (#{Opal.falsy?(`value`)}) {
             dropping = false;
             result.push(param);
@@ -374,12 +316,7 @@ module Enumerable
           buffer.shift();
         }
         if (buffer.length == n) {
-          var value = Opal.yield1(block, buffer.slice(0, n));
-
-          if (value == $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
+          Opal.yield1(block, buffer.slice(0, n));
         }
       }
 
@@ -389,8 +326,22 @@ module Enumerable
     }
   end
 
-  def each_entry(&block)
-    raise NotImplementedError
+  def each_entry(*data, &block)
+    unless block_given?
+      return to_enum(:each_entry, *data) { enumerator_size }
+    end
+
+    %x{
+      self.$each.$$p = function() {
+        var item = #{Opal.destructure(`arguments`)};
+
+        Opal.yield1(block, item);
+      }
+
+      self.$each.apply(self, data);
+
+      return self;
+    }
   end
 
   def each_slice(n, &block)
@@ -412,11 +363,7 @@ module Enumerable
         slice.push(param);
 
         if (slice.length === n) {
-          if (Opal.yield1(block, slice) === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
-
+          Opal.yield1(block, slice);
           slice = [];
         }
       };
@@ -429,9 +376,7 @@ module Enumerable
 
       // our "last" group, if smaller than n then won't have been yielded
       if (slice.length > 0) {
-        if (Opal.yield1(block, slice) === $breaker) {
-          return $breaker.$v;
-        }
+        Opal.yield1(block, slice);
       }
     }
 
@@ -446,13 +391,9 @@ module Enumerable
           index = 0;
 
       self.$each.$$p = function() {
-        var param = #{Opal.destructure(`arguments`)},
-            value = block(param, index);
+        var param = #{Opal.destructure(`arguments`)};
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
+        block(param, index);
 
         index++;
       };
@@ -474,13 +415,9 @@ module Enumerable
       var result;
 
       self.$each.$$p = function() {
-        var param = #{Opal.destructure(`arguments`)},
-            value = block(param, object);
+        var param = #{Opal.destructure(`arguments`)};
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
+        block(param, object);
       };
 
       self.$each();
@@ -519,11 +456,6 @@ module Enumerable
         var param = #{Opal.destructure(`arguments`)},
             value = Opal.yield1(block, param);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         if (#{Opal.truthy?(`value`)}) {
           result.push(param);
         }
@@ -538,59 +470,39 @@ module Enumerable
   def find_index(object = undefined, &block)
     return enum_for :find_index if `object === undefined && block === nil`
 
-    %x{
-      var result = nil,
-          index  = 0;
-
-      if (object != null) {
-        self.$each.$$p = function() {
-          var param = #{Opal.destructure(`arguments`)};
-
-          if (#{`param` == `object`}) {
-            result = index;
-            return $breaker;
-          }
-
-          index += 1;
-        };
-      }
-      else if (block !== nil) {
-        self.$each.$$p = function() {
-          var value = Opal.yieldX(block, arguments);
-
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
+    result = nil
+    index = 0
 
-          if (#{Opal.truthy?(`value`)}) {
-            result = index;
-            return $breaker;
-          }
+    if `object != null`
+      each do |*value|
+        if Opal.destructure(value) == object
+          result = index
+          break
+        end
 
-          index += 1;
-        };
-      }
+        `index += 1`
+      end
+    else
+      each do |*value|
+        if yield(*value)
+          result = index
+          break
+        end
 
-      self.$each();
+        `index += 1`
+      end
+    end
 
-      return result;
-    }
+    result
   end
 
   def first(number = undefined)
     if `number === undefined`
       result = nil
-
-      %x{
-        self.$each.$$p = function() {
-          result = #{Opal.destructure(`arguments`)};
-
-          return $breaker;
-        };
-
-        self.$each();
-      }
+      each do |value|
+        result = value
+        break
+      end
     else
       result = []
       number = Opal.coerce_to number, Integer, :to_int
@@ -603,20 +515,15 @@ module Enumerable
         return []
       end
 
-      %x{
-        var current = 0;
-        number = #{Opal.coerce_to number, Integer, :to_int};
+      current = 0
 
-        self.$each.$$p = function() {
-          result.push(#{Opal.destructure(`arguments`)});
+      each do |*args|
+        `result.push(#{Opal.destructure(args)})`
 
-          if (number <= ++current) {
-            return $breaker;
-          }
-        };
-
-        self.$each();
-      }
+        if `number <= ++current`
+          break
+        end
+      end
     end
 
     result
@@ -636,11 +543,6 @@ module Enumerable
           if (#{Opal.truthy?(`value`)}) {
             value = Opal.yield1(block, param);
 
-            if (value === $breaker) {
-              result = $breaker.$v;
-              return $breaker;
-            }
-
             result.push(value);
           }
         };
@@ -674,11 +576,6 @@ module Enumerable
         var param = #{Opal.destructure(`arguments`)},
             value = Opal.yield1(block, param);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         #{(hash[`value`] ||= []) << `param`};
       }
 
@@ -693,22 +590,15 @@ module Enumerable
   end
 
   def include?(obj)
-    %x{
-      var result = false;
-
-      self.$each.$$p = function() {
-        var param = #{Opal.destructure(`arguments`)};
-
-        if (#{`param` == obj}) {
-          result = true;
-          return $breaker;
-        }
-      }
-
-      self.$each();
+    result = false
+    each do |*args|
+      if Opal.destructure(args) == obj
+        result = true
+        break
+      end
+    end
 
-      return result;
-    }
+    result
   end
 
   def inject(object = undefined, sym = undefined, &block)
@@ -726,11 +616,6 @@ module Enumerable
 
           value = Opal.yieldX(block, [result, value]);
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
-
           result = value;
         };
       }
@@ -774,24 +659,23 @@ module Enumerable
 
   alias map collect
 
-  def max(&block)
+  def max(n = undefined, &block)
     %x{
-      var result;
+      if (n === undefined || n === nil) {
+        var result, value;
 
-      if (block !== nil) {
         self.$each.$$p = function() {
-          var param = #{Opal.destructure(`arguments`)};
+          var item = #{Opal.destructure(`arguments`)};
 
           if (result === undefined) {
-            result = param;
+            result = item;
             return;
           }
 
-          var value = block(param, result);
-
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
+          if (block !== nil) {
+            value = Opal.yieldX(block, [item, result]);
+          } else {
+            value = #{`item` <=> `result`};
           }
 
           if (value === nil) {
@@ -799,29 +683,23 @@ module Enumerable
           }
 
           if (value > 0) {
-            result = param;
+            result = item;
           }
-        };
-      }
-      else {
-        self.$each.$$p = function() {
-          var param = #{Opal.destructure(`arguments`)};
+        }
 
-          if (result === undefined) {
-            result = param;
-            return;
-          }
+        self.$each();
 
-          if (#{Opal.compare(`param`, `result`)} > 0) {
-            result = param;
-          }
-        };
+        if (result === undefined) {
+          return nil;
+        } else {
+          return result;
+        }
       }
+    }
 
-      self.$each();
+    n = Opal.coerce_to(n, Integer, :to_int)
 
-      return result === undefined ? nil : result;
-    }
+    sort(&block).reverse.first(n)
   end
 
   def max_by(&block)
@@ -841,11 +719,6 @@ module Enumerable
           return;
         }
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         if (#{`value` <=> `by`} > 0) {
           result = param
           by     = value;
@@ -875,11 +748,6 @@ module Enumerable
 
           var value = block(param, result);
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
-
           if (value === nil) {
             #{raise ArgumentError, "comparison failed"};
           }
@@ -927,11 +795,6 @@ module Enumerable
           return;
         }
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         if (#{`value` <=> `by`} < 0) {
           result = param
           by     = value;
@@ -985,83 +848,63 @@ module Enumerable
   end
 
   def none?(&block)
-    %x{
-      var result = true;
+    result = true
 
-      if (block !== nil) {
-        self.$each.$$p = function() {
-          var value = Opal.yieldX(block, arguments);
+    if block_given?
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
+      each do |*value|
+        if yield(*value)
+          result = false
+          break
+        end
+      end
 
-          if (#{Opal.truthy?(`value`)}) {
-            result = false;
-            return $breaker;
-          }
-        }
-      }
-      else {
-        self.$each.$$p = function() {
-          var value = #{Opal.destructure(`arguments`)};
+    else
 
-          if (#{Opal.truthy?(`value`)}) {
-            result = false;
-            return $breaker;
-          }
-        };
-      }
+      each do |*value|
+        if Opal.destructure(value)
+          result = false
+          break
+        end
+      end
 
-      self.$each();
+    end
 
-      return result;
-    }
+    result
   end
 
   def one?(&block)
-    %x{
-      var result = false;
+    result = false
 
-      if (block !== nil) {
-        self.$each.$$p = function() {
-          var value = Opal.yieldX(block, arguments);
+    if block_given?
 
-          if (value === $breaker) {
-            result = $breaker.$v;
-            return $breaker;
-          }
+      each do |*value|
+        if yield(*value)
+          if result
+            result = false
+            break
+          end
 
-          if (#{Opal.truthy?(`value`)}) {
-            if (result === true) {
-              result = false;
-              return $breaker;
-            }
+          result = true
+        end
+      end
 
-            result = true;
-          }
-        }
-      }
-      else {
-        self.$each.$$p = function() {
-          var value = #{Opal.destructure(`arguments`)};
+    else
 
-          if (#{Opal.truthy?(`value`)}) {
-            if (result === true) {
-              result = false;
-              return $breaker;
-            }
+      each do |*value|
+        if Opal.destructure(value)
+          if result
+            result = false
+            break
+          end
 
-            result = true;
-          }
-        }
-      }
+          result = true
+        end
+      end
 
-      self.$each();
+    end
 
-      return result;
-    }
+    result
   end
 
   def partition(&block)
@@ -1074,11 +917,6 @@ module Enumerable
         var param = #{Opal.destructure(`arguments`)},
             value = Opal.yield1(block, param);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         if (#{Opal.truthy?(`value`)}) {
           truthy.push(param);
         }
@@ -1105,11 +943,6 @@ module Enumerable
         var param = #{Opal.destructure(`arguments`)},
             value = Opal.yield1(block, param);
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
         if (#{Opal.falsy?(`value`)}) {
           result.push(param);
         }
@@ -1206,7 +1039,7 @@ module Enumerable
   def sort(&block)
     ary = to_a
     block = -> a,b {a <=> b} unless block_given?
-    return `ary.sort(block)`
+    return ary.sort(&block)
   end
 
   def sort_by(&block)
@@ -1214,7 +1047,7 @@ module Enumerable
 
     dup = map {
       arg = Opal.destructure(`arguments`)
-      [block.call(arg), arg]
+      [yield(arg), arg]
     }
     dup.sort! { |a, b| `a[0]` <=> `b[0]` }
     dup.map! { |i| `i[1]` }
@@ -1227,29 +1060,19 @@ module Enumerable
   def take_while(&block)
     return enum_for :take_while unless block
 
-    %x{
-      var result = [];
+    result = []
 
-      self.$each.$$p = function() {
-        var param = #{Opal.destructure(`arguments`)},
-            value = Opal.yield1(block, param);
+    each do |*args|
+      value = Opal.destructure(args)
 
-        if (value === $breaker) {
-          result = $breaker.$v;
-          return $breaker;
-        }
-
-        if (#{Opal.falsy?(`value`)}) {
-          return $breaker;
-        }
-
-        result.push(param);
-      };
+      unless yield(value)
+        break
+      end
 
-      self.$each();
+      `result.push(value)`
+    end
 
-      return result;
-    }
+    result
   end
 
   alias to_a entries