opal 0.3.19 → 0.3.20

data/core/kernel.rb

@@ -3,6 +3,10 @@ module Kernel
     false
   end
 
+  def ==(other)
+    `this === other`
+  end
+
   def ===(other)
     `this == other`
   end
@@ -39,8 +43,12 @@ module Kernel
         no_block_given();
       }
 
+      var jsid = mid_to_jsid(name);
+      body._jsid = jsid;
+      body._sup  = this[jsid]
+
       // FIXME: need to donate()
-      this.$singleton_class()._proto[mid_to_jsid(name)] = body;
+      this.$singleton_class().prototype[jsid] = body;
 
       return this;
     }
@@ -53,17 +61,13 @@ module Kernel
   def extend(*mods)
     %x{
       for (var i = 0, length = mods.length; i < length; i++) {
-        include_module(singleton_class(this), mods[i]);
+        this.$singleton_class().$include(mods[i]);
       }
 
       return this;
     }
   end
 
-  def format(string, *arguments)
-    raise NotImplementedError
-  end
-
   def hash
     `this._id`
   end
@@ -132,7 +136,7 @@ module Kernel
     %x{
       while (true) {
         if (block.call(__context) === __breaker) {
-          return breaker.$v;
+          return __breaker.$v;
         }
       }
 
@@ -148,14 +152,6 @@ module Kernel
     `this._id || (this._id = unique_id++)`
   end
 
-  def print(*strs)
-    puts *strs
-  end
-
-  def private(*)
-    # does nothing. here for documenting code
-  end
-
   def proc(&block)
     %x{
       if (block === nil) {
@@ -166,45 +162,32 @@ module Kernel
     }
   end
 
-  def protected(*)
-    # does nothing. here for documenting code
-  end
-
-  def public(*)
-    # does nothing. here for documenting code
-  end
-
   def puts(*strs)
     %x{
       for (var i = 0; i < strs.length; i++) {
-        var obj = strs[i];
-        console.log(#{ `obj`.to_s });
+        console.log(#{ `strs[i]`.to_s });
       }
     }
     nil
   end
 
-  alias sprintf format
+  alias print puts
 
-  def raise(exception, string = undefined)
+  def raise(exception, string)
     %x{
       if (typeof(exception) === 'string') {
         exception = #{RuntimeError.new exception};
       }
-      else if (#{!exception.is_a? Exception}) {
-        exception = #{`exception`.new string};
+      else if (!#{exception.is_a? Exception}) {
+        exception = #{exception.new string};
       }
 
       throw exception;
     }
   end
 
-  def rand(max = undefined)
-    `max === undefined ? Math.random() : Math.floor(Math.random() * max)`
-  end
-
-  def require(path)
-    `Opal.require(path)`
+  def rand(max)
+    `max == null ? Math.random() : Math.floor(Math.random() * max)`
   end
 
   def respond_to?(name)
@@ -213,38 +196,40 @@ module Kernel
 
   def singleton_class
     %x{
-      var obj = this, klass;
-
-      if (obj._isObject) {
-        if (obj._isNumber || obj._isString) {
-          throw RubyTypeError.$new("can't define singleton");
-        }
+      if (!this._isObject) {
+        return this._real;
       }
 
-      if ((obj._klass._isSingleton) && obj._klass.__attached__ == obj) {
-        klass = obj._klass;
+      if (this._klass._isSingleton) {
+        return this._klass;
       }
       else {
-        var class_id = obj._klass._name;
-        klass = make_metaclass(obj, obj._klass);
-      }
+        var orig_class = this._klass,
+            class_id   = "#<Class:#<" + orig_class._name + ":" + orig_class._id + ">>";
+
+        function _Singleton() {};
+        var meta = boot_class(orig_class, _Singleton);
+        meta._name = class_id;
 
-      return klass;
+        meta._isSingleton = true;
+        meta.prototype = this;
+        this._klass = meta;
+        meta._klass = orig_class._real;
+
+        return meta;
+      }
     }
   end
 
   def tap(&block)
-    %x{
-      if (block === nil) {
-        no_block_given();
-      }
+    `if (block === nil) no_block_given();`
 
-      if (block.call(__context, this) === __breaker) {
-        return __breaker.$v;
-      }
+    yield self
+    self
+  end
 
-      return this;
-    }
+  def to_json
+    to_s.to_json
   end
 
   def to_proc
@@ -254,4 +239,10 @@ module Kernel
   def to_s
     `return "#<" + this._klass._real._name + ":0x" + (this._id * 400487).toString(16) + ">";`
   end
-end
+
+  def enum_for (method = :each, *args)
+    Enumerator.new(self, method, *args)
+  end
+
+  alias to_enum enum_for
+end

data/core/load_order

@@ -1,10 +1,10 @@
 alpha
-basic_object
 module
+class
+basic_object
 kernel
 object
 top_self
-class
 boolean
 nil_class
 enumerable
@@ -18,8 +18,6 @@ proc
 range
 error
 regexp
-match_data
 time
 struct
-file
-dir
+json

data/core/module.rb

@@ -1,27 +1,6 @@
 class Module
-  def ===(object)
-    %x{
-
-      if (object == null) {
-        return false;
-      }
-
-      var search = object._klass;
-
-      while (search) {
-        if (search === this) {
-          return true;
-        }
-
-        search = search._super;
-      }
-
-      return false;
-    }
-  end
-
   def alias_method(newname, oldname)
-    `this._proto[mid_to_jsid(newname)] = this._proto[mid_to_jsid(oldname)]`
+    `this.prototype[mid_to_jsid(newname)] = this.prototype[mid_to_jsid(oldname)]`
     self
   end
 
@@ -55,8 +34,10 @@ class Module
         klass.$included_modules = [];
       }
 
-      if (klass.$included_modules.indexOf(module) != -1) {
-        return;
+      for (var idx = 0, length = klass.$included_modules.length; idx < length; idx++) {
+        if (klass.$included_modules[idx] === module) {
+          return;
+        }
       }
 
       klass.$included_modules.push(module);
@@ -67,8 +48,8 @@ class Module
 
       module.$included_in.push(klass);
 
-      var donator   = module._alloc.prototype,
-          prototype = klass._proto,
+      var donator   = module.prototype,
+          prototype = klass.prototype,
           methods   = module._methods;
 
       for (var i = 0, length = methods.length; i < length; i++) {
@@ -77,7 +58,7 @@ class Module
       }
 
       if (klass.$included_in) {
-        __donate(klass, methods.slice(), true);
+        klass._donate(methods.slice(), true);
       }
     }
 
@@ -90,22 +71,22 @@ class Module
       if (getter) {
         var get_jsid = mid_to_jsid(name);
 
-        klass._alloc.prototype[get_jsid] = function() {
+        klass.prototype[get_jsid] = function() {
           var res = this[name];
           return res == null ? nil : res;
         };
 
-        __donate(klass, [get_jsid]);
+        klass._donate([get_jsid]);
       }
 
       if (setter) {
         var set_jsid = mid_to_jsid(name + '=');
 
-        klass._alloc.prototype[set_jsid] = function(val) {
+        klass.prototype[set_jsid] = function(val) {
           return this[name] = val;
         };
 
-        __donate(klass, [set_jsid]);
+        klass._donate([set_jsid]);
       }
     }
   }
@@ -154,9 +135,10 @@ class Module
 
       var jsid = mid_to_jsid(name);
       block._jsid = jsid;
+      block._sup = this.prototype[jsid];
 
-      this._alloc.prototype[jsid] = block;
-      __donate(this, [jsid]);
+      this.prototype[jsid] = block;
+      this._donate([jsid]);
 
       return nil;
     }
@@ -167,10 +149,14 @@ class Module
       var i = mods.length - 1, mod;
       while (i >= 0) {
         mod = mods[i];
+        i--;
+
+        if (mod === this) {
+          continue;
+        }
         define_iclass(this, mod);
         mod.$append_features(this);
         mod.$included(this);
-        i--;
       }
 
       return this;
@@ -203,5 +189,21 @@ class Module
 
   alias public_instance_methods instance_methods
 
+  def singleton_class
+    %x{
+      if (this._klass._isSingleton) {
+        return this._klass;
+      }
+      else {
+        var meta = new __opal.Class;
+        this._klass = meta;
+        meta._isSingleton = true;
+        meta.prototype = this;
+
+        return meta;
+      }
+    }
+  end
+
   alias to_s name
-end
+end

data/core/nil_class.rb

@@ -37,6 +37,10 @@ class NilClass
 
   alias to_f to_i
 
+  def to_json
+    'null'
+  end
+
   def to_s
     ''
   end

data/core/numeric.rb

@@ -1,6 +1,6 @@
 class Numeric < `Number`
   %x{
-    def._isNumber = true;
+    Numeric_prototype._isNumber = true;
   }
 
   include Comparable
@@ -84,7 +84,7 @@ class Numeric < `Number`
   def <=>(other)
     %x{
       if (typeof(other) !== 'number') {
-        return null;
+        return nil;
       }
 
       return this < other ? -1 : (this > other ? 1 : 0);
@@ -144,7 +144,7 @@ class Numeric < `Number`
   end
 
   def nonzero?
-    `this.valueOf() === 0 ? null : this`
+    `this.valueOf() === 0 ? nil : this`
   end
 
   def odd?
@@ -162,7 +162,7 @@ class Numeric < `Number`
   alias succ next
 
   def times(&block)
-    return enum_for :times unless block
+    return enum_for :times unless block_given?
 
     %x{
       for (var i = 0; i <= this; i++) {
@@ -183,6 +183,10 @@ class Numeric < `Number`
     `parseInt(this)`
   end
 
+  def to_json
+    `this.toString()`
+  end
+
   def to_s(base = 10)
     `this.toString()`
   end
@@ -202,30 +206,6 @@ class Numeric < `Number`
   end
 
   def zero?
-    `this.valueOf() === 0`
-  end
-end
-
-class Integer
-  def self.===(obj)
-    %x{
-      if (typeof(obj) !== 'number') {
-        return false;
-      }
-
-      return other % 1 === 0;
-    }
-  end
-end
-
-class Float
-  def self.===(obj)
-    %x{
-      if (typeof(obj) !== 'number') {
-        return false;
-      }
-
-      return obj % 1 !== 0;
-    }
+    `this == 0`
   end
-end
+end

data/core/proc.rb

@@ -1,6 +1,6 @@
 class Proc < `Function`
   %x{
-    def._isProc = true;
+    Proc_prototype._isProc = true;
   }
 
   def self.new(&block)

data/core/range.rb

@@ -2,11 +2,10 @@ class Range
   include Enumerable
 
   %x{
-    var range_class = this;
-    def._isRange = true;
+    Range.prototype._isRange = true;
 
     Opal.range = function(beg, end, exc) {
-      var range         = new range_class._alloc();
+      var range         = new Range;
           range.begin   = beg;
           range.end     = end;
           range.exclude = exc;
@@ -94,4 +93,4 @@ class Range
   def inspect
     `this.begin + (this.exclude ? '...' : '..') + this.end`
   end
-end
+end