opal 0.3.18 → 0.3.19

data/core/kernel.rb

@@ -29,29 +29,18 @@ module Kernel
     }
   end
 
-  def at_exit(&block)
-    %x{
-      if (block === null) {
-        throw RubyArgError.$new('called without a block');
-      }
-
-      end_procs.push(block);
-
-      return block;
-    }
-  end
-
   def class
-    `class_real(this._klass)`
+    `return this._real`
   end
 
   def define_singleton_method(name, &body)
     %x{
-      if (body === null) {
-        throw RubyLocalJumpError.$new('no block given');
+      if (body === nil) {
+        no_block_given();
       }
 
-      opal.defs(this, mid_to_jsid(name), body);
+      // FIXME: need to donate()
+      this.$singleton_class()._proto[mid_to_jsid(name)] = body;
 
       return this;
     }
@@ -88,14 +77,14 @@ module Kernel
   end
 
   def instance_variable_defined?(name)
-    `hasOwnProperty.call(this, name.substr(1))`
+    `__hasOwn.call(this, name.substr(1))`
   end
 
   def instance_variable_get(name)
     %x{
       var ivar = this[name.substr(1)];
 
-      return ivar == undefined ? null : ivar;
+      return ivar == null ? nil : ivar;
     }
   end
 
@@ -142,7 +131,7 @@ module Kernel
 
     %x{
       while (true) {
-        if (block.call(__context) === breaker) {
+        if (block.call(__context) === __breaker) {
           return breaker.$v;
         }
       }
@@ -168,7 +157,13 @@ module Kernel
   end
 
   def proc(&block)
-    block
+    %x{
+      if (block === nil) {
+        no_block_given();
+      }
+
+      return block;
+    }
   end
 
   def protected(*)
@@ -183,9 +178,10 @@ module Kernel
     %x{
       for (var i = 0; i < strs.length; i++) {
         var obj = strs[i];
-        console.log(obj == null ? "nil" : obj.$to_s());
+        console.log(#{ `obj`.to_s });
       }
     }
+    nil
   end
 
   alias sprintf format
@@ -193,9 +189,9 @@ module Kernel
   def raise(exception, string = undefined)
     %x{
       if (typeof(exception) === 'string') {
-        exception = #{`RubyRuntimeError`.new `exception`};
+        exception = #{RuntimeError.new exception};
       }
-      else if (#{!exception.is_a? `RubyException`}) {
+      else if (#{!exception.is_a? Exception}) {
         exception = #{`exception`.new string};
       }
 
@@ -208,7 +204,7 @@ module Kernel
   end
 
   def require(path)
-    `require_handler(path);`
+    `Opal.require(path)`
   end
 
   def respond_to?(name)
@@ -219,18 +215,17 @@ module Kernel
     %x{
       var obj = this, klass;
 
-      if (obj._flags & T_OBJECT) {
-        if ((obj._flags & T_NUMBER) || (obj._flags & T_STRING)) {
+      if (obj._isObject) {
+        if (obj._isNumber || obj._isString) {
           throw RubyTypeError.$new("can't define singleton");
         }
       }
 
-      if ((obj._klass._flags & FL_SINGLETON) && obj._klass.__attached__ == obj) {
+      if ((obj._klass._isSingleton) && obj._klass.__attached__ == obj) {
         klass = obj._klass;
       }
       else {
         var class_id = obj._klass._name;
-
         klass = make_metaclass(obj, obj._klass);
       }
 
@@ -240,8 +235,8 @@ module Kernel
 
   def tap(&block)
     %x{
-      if (block === null) {
-        throw RubyLocalJumpError.$new('no block given');
+      if (block === nil) {
+        no_block_given();
       }
 
       if (block.call(__context, this) === __breaker) {
@@ -252,7 +247,11 @@ module Kernel
     }
   end
 
+  def to_proc
+    self
+  end
+
   def to_s
-    `return "#<" + class_real(this._klass)._name + ":0x" + (this._id * 400487).toString(16) + ">";`
+    `return "#<" + this._klass._real._name + ":0x" + (this._id * 400487).toString(16) + ">";`
   end
 end

data/core/load_order

@@ -1,7 +1,7 @@
 alpha
+basic_object
 module
 kernel
-basic_object
 object
 top_self
 class
@@ -20,4 +20,6 @@ error
 regexp
 match_data
 time
-struct
+struct
+file
+dir

data/core/module.rb

@@ -1,6 +1,11 @@
 class Module
   def ===(object)
     %x{
+
+      if (object == null) {
+        return false;
+      }
+
       var search = object._klass;
 
       while (search) {
@@ -16,8 +21,7 @@ class Module
   end
 
   def alias_method(newname, oldname)
-    `opal.alias(this, newname, oldname)`
-
+    `this._proto[mid_to_jsid(newname)] = this._proto[mid_to_jsid(oldname)]`
     self
   end
 
@@ -27,10 +31,10 @@ class Module
           result = [];
 
       while (parent) {
-        if (parent._flags & FL_SINGLETON) {
+        if (parent._isSingleton) {
           continue;
         }
-        else if (parent._flags & T_ICLASS)
+        else if (parent._isIClass)
           result.push(parent._klass);
         else {
           result.push(parent);
@@ -65,19 +69,15 @@ class Module
 
       var donator   = module._alloc.prototype,
           prototype = klass._proto,
-          methods   = [];
-
-      for (var method in donator) {
-        if (hasOwnProperty.call(donator, method)) {
-          if (!prototype.hasOwnProperty(method)) {
-            prototype[method] = donator[method];
-            methods.push(method);
-          }
-        }
+          methods   = module._methods;
+
+      for (var i = 0, length = methods.length; i < length; i++) {
+        var method = methods[i];
+        prototype[method] = donator[method];
       }
 
       if (klass.$included_in) {
-        klass.$donate(methods);
+        __donate(klass, methods.slice(), true);
       }
     }
 
@@ -88,17 +88,24 @@ class Module
   %x{
     function define_attr(klass, name, getter, setter) {
       if (getter) {
-        define_method(klass, mid_to_jsid(name), function() {
+        var get_jsid = mid_to_jsid(name);
+
+        klass._alloc.prototype[get_jsid] = function() {
           var res = this[name];
+          return res == null ? nil : res;
+        };
 
-          return res == null ? null : res;
-        });
+        __donate(klass, [get_jsid]);
       }
 
       if (setter) {
-        define_method(klass, mid_to_jsid(name + '='), function(val) {
+        var set_jsid = mid_to_jsid(name + '=');
+
+        klass._alloc.prototype[set_jsid] = function(val) {
           return this[name] = val;
-        });
+        };
+
+        __donate(klass, [set_jsid]);
       }
     }
   }
@@ -109,7 +116,7 @@ class Module
         define_attr(this, attrs[i], true, true);
       }
 
-      return null;
+      return nil;
     }
   end
 
@@ -119,7 +126,7 @@ class Module
         define_attr(this, attrs[i], true, false);
       }
 
-      return null;
+      return nil;
     }
   end
 
@@ -129,7 +136,7 @@ class Module
         define_attr(this, attrs[i], false, true);
       }
 
-      return null;
+      return nil;
     }
   end
 
@@ -139,43 +146,19 @@ class Module
     self
   end
 
-  def define_method(name, &body)
+  def define_method(name, &block)
     %x{
-      if (body === null) {
-        throw RubyLocalJumpError.$new('no block given');
+      if (block === nil) {
+        no_block_given();
       }
 
       var jsid = mid_to_jsid(name);
+      block._jsid = jsid;
 
-      body.o$jsid = jsid;
-      define_method(this, jsid, body);
+      this._alloc.prototype[jsid] = block;
+      __donate(this, [jsid]);
 
-      return null;
-    }
-  end
-
-  # FIXME: this could do with a better name
-  def donate(methods)
-    %x{
-      var included_in = this.$included_in, includee, method, table = this._proto, dest;
-
-      if (included_in) {
-        for (var i = 0, length = included_in.length; i < length; i++) {
-          includee = included_in[i];
-          dest = includee._proto;
-          for (var j = 0, jj = methods.length; j < jj; j++) {
-            method = methods[j];
-            // if (!dest[method]) {
-              dest[method] = table[method];
-            // }
-          }
-          // if our includee is itself included in another module/class then it
-          // should also donate its new methods
-          if (includee.$included_in) {
-            includee.$donate(methods);
-          }
-        }
-      }
+      return nil;
     }
   end
 
@@ -183,13 +166,10 @@ class Module
     %x{
       var i = mods.length - 1, mod;
       while (i >= 0) {
-        #{mod = `mods[i]`};
-
+        mod = mods[i];
         define_iclass(this, mod);
-
-        #{mod.append_features self};
-        #{mod.included self};
-
+        mod.$append_features(this);
+        mod.$included(this);
         i--;
       }
 
@@ -207,11 +187,11 @@ class Module
 
   def module_eval(&block)
     %x{
-      if (block === null) {
-        throw RubyLocalJumpError.$new('no block given');
+      if (block === nil) {
+        no_block_given();
       }
 
-      return block.call(this, null);
+      return block.call(this);
     }
   end
 

data/core/numeric.rb

@@ -1,4 +1,8 @@
-class Numeric
+class Numeric < `Number`
+  %x{
+    def._isNumber = true;
+  }
+
   include Comparable
 
   def +(other)
@@ -113,6 +117,8 @@ class Numeric
     }
   end
 
+  alias eql? ==
+
   def even?
     `this % 2 === 0`
   end

data/core/object.rb

@@ -14,4 +14,4 @@ class Object
   def singleton_methods
     []
   end
-end
+end

data/core/proc.rb

@@ -1,6 +1,10 @@
-class Proc
+class Proc < `Function`
+  %x{
+    def._isProc = true;
+  }
+
   def self.new(&block)
-    raise ArgumentError, 'tried to create Proc object without a block' unless block_given?
+    `if (block === nil) no_block_given();`
 
     block
   end

data/core/range.rb

@@ -1,18 +1,20 @@
-# Helper function on runtime for creating range literals
-%x{
-  Opal.range = function(beg, end, exc) {
-    var range         = new RubyRange._alloc();
-        range.begin   = beg;
-        range.end     = end;
-        range.exclude = exc;
-
-    return range;
-  };
-}
-
 class Range
   include Enumerable
 
+  %x{
+    var range_class = this;
+    def._isRange = true;
+
+    Opal.range = function(beg, end, exc) {
+      var range         = new range_class._alloc();
+          range.begin   = beg;
+          range.end     = end;
+          range.exclude = exc;
+
+      return range;
+    };
+  }
+
   def initialize(min, max, exclude = false)
     @begin   = min
     @end     = max
@@ -73,23 +75,9 @@ class Range
     `return obj >= this.begin && obj <= this.end`
   end
 
-  def max
-    if block_given?
-      # I actually don't get what this should do
-      raise NotImplementedError
-    else
-      `this.end`
-    end
-  end
+  alias max end
 
-  def min
-    if block_given?
-      # I actually don't get what this should do
-      raise NotImplementedError
-    else
-      `this.begin`
-    end
-  end
+  alias min begin
 
   alias member? include?