opal 0.3.20 → 0.3.21

data/core/kernel.rb

@@ -4,11 +4,11 @@ module Kernel
   end
 
   def ==(other)
-    `this === other`
+    `#{self} === other`
   end
 
   def ===(other)
-    `this == other`
+    `#{self} == other`
   end
 
   def Array(object)
@@ -34,7 +34,7 @@ module Kernel
   end
 
   def class
-    `return this._real`
+    `return #{self}.$k`
   end
 
   def define_singleton_method(name, &body)
@@ -43,33 +43,33 @@ module Kernel
         no_block_given();
       }
 
-      var jsid = mid_to_jsid(name);
-      body._jsid = jsid;
-      body._sup  = this[jsid]
+      #{ self.singleton_class };
 
-      // FIXME: need to donate()
-      this.$singleton_class().prototype[jsid] = body;
+      body._jsid = name;
+      body._sup  = #{self}.$m[name]
 
-      return this;
+      #{self}.$m[name] = body;
+
+      return #{self};
     }
   end
 
   def equal?(other)
-    `this === other`
+    `#{self} === other`
   end
 
   def extend(*mods)
     %x{
       for (var i = 0, length = mods.length; i < length; i++) {
-        this.$singleton_class().$include(mods[i]);
+        #{ self.singleton_class.include `mods[i]` };
       }
 
-      return this;
+      return #{self};
     }
   end
 
   def hash
-    `this._id`
+    `#{self}._id`
   end
 
   def inspect
@@ -77,30 +77,30 @@ module Kernel
   end
 
   def instance_of?(klass)
-    `this._klass === klass`
+    `#{self}.$k === klass`
   end
 
   def instance_variable_defined?(name)
-    `__hasOwn.call(this, name.substr(1))`
+    `__hasOwn.call(#{self}, name.substr(1))`
   end
 
   def instance_variable_get(name)
     %x{
-      var ivar = this[name.substr(1)];
+      var ivar = #{self}[name.substr(1)];
 
       return ivar == null ? nil : ivar;
     }
   end
 
   def instance_variable_set(name, value)
-    `this[name.substr(1)] = value`
+    `#{self}[name.substr(1)] = value`
   end
 
   def instance_variables
     %x{
       var result = [];
 
-      for (var name in this) {
+      for (var name in #{self}) {
         result.push(name);
       }
 
@@ -110,14 +110,14 @@ module Kernel
 
   def is_a?(klass)
     %x{
-      var search = this._klass;
+      var search = #{self}.$k;
 
       while (search) {
         if (search === klass) {
           return true;
         }
 
-        search = search._super;
+        search = search.$s;
       }
 
       return false;
@@ -133,15 +133,11 @@ module Kernel
   def loop(&block)
     return enum_for :loop unless block_given?
 
-    %x{
-      while (true) {
-        if (block.call(__context) === __breaker) {
-          return __breaker.$v;
-        }
-      }
+    `while (true) {`
+      yield
+    `}`
 
-      return this;
-    }
+    self
   end
 
   def nil?
@@ -149,7 +145,7 @@ module Kernel
   end
 
   def object_id
-    `this._id || (this._id = unique_id++)`
+    `#{self}._id || (#{self}._id = unique_id++)`
   end
 
   def proc(&block)
@@ -191,30 +187,30 @@ module Kernel
   end
 
   def respond_to?(name)
-    `!!this[mid_to_jsid(name)]`
+    `!!#{self}.$m[name]`
   end
 
   def singleton_class
     %x{
-      if (!this._isObject) {
-        return this._real;
+      if (!#{self}._isObject) {
+        return #{self}.$k;
       }
 
-      if (this._klass._isSingleton) {
-        return this._klass;
+      if (#{self}._singleton) {
+        return #{self}._singleton;
       }
+
       else {
-        var orig_class = this._klass,
+        var orig_class = #{self}.$k,
             class_id   = "#<Class:#<" + orig_class._name + ":" + orig_class._id + ">>";
 
-        function _Singleton() {};
-        var meta = boot_class(orig_class, _Singleton);
+        function Singleton() {};
+        var meta = boot_class(orig_class, Singleton);
         meta._name = class_id;
 
-        meta._isSingleton = true;
-        meta.prototype = this;
-        this._klass = meta;
-        meta._klass = orig_class._real;
+        #{self}.$m = meta.$m_tbl;
+        #{self}._singleton = meta;
+        meta.$k = orig_class.$k;
 
         return meta;
       }
@@ -237,7 +233,7 @@ module Kernel
   end
 
   def to_s
-    `return "#<" + this._klass._real._name + ":0x" + (this._id * 400487).toString(16) + ">";`
+    `return "#<" + #{self}.$k._name + ":" + #{self}._id + ">";`
   end
 
   def enum_for (method = :each, *args)

data/core/module.rb

@@ -1,24 +1,36 @@
 class Module
+  def ===(object)
+    %x{
+      if (object == null) {
+        return false;
+      }
+
+      var search = object.$k;
+
+      while (search) {
+        if (search === #{self}) {
+          return true;
+        }
+
+        search = search._super;
+      }
+
+      return false;
+    }
+  end
+
   def alias_method(newname, oldname)
-    `this.prototype[mid_to_jsid(newname)] = this.prototype[mid_to_jsid(oldname)]`
+    `#{self}.$m_tbl[newname] = #{self}.$m_tbl[oldname]`
     self
   end
 
   def ancestors
     %x{
-      var parent = this,
+      var parent = #{self},
           result = [];
 
       while (parent) {
-        if (parent._isSingleton) {
-          continue;
-        }
-        else if (parent._isIClass)
-          result.push(parent._klass);
-        else {
-          result.push(parent);
-        }
-
+        result.push(parent);
         parent = parent._super;
       }
 
@@ -28,7 +40,7 @@ class Module
 
   def append_features(klass)
     %x{
-      var module = this;
+      var module = #{self};
 
       if (!klass.$included_modules) {
         klass.$included_modules = [];
@@ -48,17 +60,15 @@ class Module
 
       module.$included_in.push(klass);
 
-      var donator   = module.prototype,
-          prototype = klass.prototype,
-          methods   = module._methods;
+      var donator   = module.$m_tbl,
+          target    = klass.$m_tbl;
 
-      for (var i = 0, length = methods.length; i < length; i++) {
-        var method = methods[i];
-        prototype[method] = donator[method];
+      for (var meth in donator) {
+        target[meth] = donator[meth];
       }
 
       if (klass.$included_in) {
-        klass._donate(methods.slice(), true);
+       // klass._donate(methods.slice(), true);
       }
     }
 
@@ -69,24 +79,20 @@ class Module
   %x{
     function define_attr(klass, name, getter, setter) {
       if (getter) {
-        var get_jsid = mid_to_jsid(name);
-
-        klass.prototype[get_jsid] = function() {
-          var res = this[name];
+        klass.$m_tbl[name] = function() {
+          var res = #{self}[name];
           return res == null ? nil : res;
         };
 
-        klass._donate([get_jsid]);
+        klass._donate([name]);
       }
 
       if (setter) {
-        var set_jsid = mid_to_jsid(name + '=');
-
-        klass.prototype[set_jsid] = function(val) {
-          return this[name] = val;
+        klass.$m_tbl[name + '='] = function(val) {
+          return #{self}[name] = val;
         };
 
-        klass._donate([set_jsid]);
+        klass._donate([name]);
       }
     }
   }
@@ -94,7 +100,7 @@ class Module
   def attr_accessor(*attrs)
     %x{
       for (var i = 0, length = attrs.length; i < length; i++) {
-        define_attr(this, attrs[i], true, true);
+        define_attr(#{self}, attrs[i], true, true);
       }
 
       return nil;
@@ -104,7 +110,7 @@ class Module
   def attr_reader(*attrs)
     %x{
       for (var i = 0, length = attrs.length; i < length; i++) {
-        define_attr(this, attrs[i], true, false);
+        define_attr(#{self}, attrs[i], true, false);
       }
 
       return nil;
@@ -114,7 +120,7 @@ class Module
   def attr_writer(*attrs)
     %x{
       for (var i = 0, length = attrs.length; i < length; i++) {
-        define_attr(this, attrs[i], false, true);
+        define_attr(#{self}, attrs[i], false, true);
       }
 
       return nil;
@@ -122,7 +128,7 @@ class Module
   end
 
   def attr(name, setter = false)
-    `define_attr(this, name, true, setter)`
+    `define_attr(#{self}, name, true, setter)`
 
     self
   end
@@ -133,12 +139,11 @@ class Module
         no_block_given();
       }
 
-      var jsid = mid_to_jsid(name);
-      block._jsid = jsid;
-      block._sup = this.prototype[jsid];
+      block._jsid = name;
+      block._sup = #{self}.$m_tbl[name];
 
-      this.prototype[jsid] = block;
-      this._donate([jsid]);
+      #{self}.$m_tbl[name] = block;
+      #{self}._donate([name]);
 
       return nil;
     }
@@ -151,15 +156,15 @@ class Module
         mod = mods[i];
         i--;
 
-        if (mod === this) {
+        if (mod === #{self}) {
           continue;
         }
-        define_iclass(this, mod);
-        mod.$append_features(this);
-        mod.$included(this);
+
+        #{ `mod`.append_features self };
+        #{ `mod`.included self };
       }
 
-      return this;
+      return #{self};
     }
   end
 
@@ -177,31 +182,29 @@ class Module
         no_block_given();
       }
 
-      return block.call(this);
+      return block(#{self});
     }
   end
 
   alias class_eval module_eval
 
   def name
-    `this._name`
+    `#{self}._name`
   end
 
   alias public_instance_methods instance_methods
 
   def singleton_class
     %x{
-      if (this._klass._isSingleton) {
-        return this._klass;
+      if (#{self}._singleton) {
+        return #{self}._singleton;
       }
-      else {
-        var meta = new __opal.Class;
-        this._klass = meta;
-        meta._isSingleton = true;
-        meta.prototype = this;
 
-        return meta;
-      }
+      var meta = new __opal.Class;
+      #{self}._singleton = meta;
+      meta.$m_tbl = #{self}.$m;
+
+      return meta;
     }
   end
 

data/core/numeric.rb

@@ -6,79 +6,79 @@ class Numeric < `Number`
   include Comparable
 
   def +(other)
-    `this + other`
+    `#{self} + other`
   end
 
   def -(other)
-    `this - other`
+    `#{self} - other`
   end
 
   def *(other)
-    `this * other`
+    `#{self} * other`
   end
 
   def /(other)
-    `this / other`
+    `#{self} / other`
   end
 
   def %(other)
-    `this % other`
+    `#{self} % other`
   end
 
   def &(other)
-    `this & other`
+    `#{self} & other`
   end
 
   def |(other)
-    `this | other`
+    `#{self} | other`
   end
 
   def ^(other)
-    `this ^ other`
+    `#{self} ^ other`
   end
 
   def <(other)
-    `this < other`
+    `#{self} < other`
   end
 
   def <=(other)
-    `this <= other`
+    `#{self} <= other`
   end
 
   def >(other)
-    `this > other`
+    `#{self} > other`
   end
 
   def >=(other)
-    `this >= other`
+    `#{self} >= other`
   end
 
   def <<(count)
-    `this << count`
+    `#{self} << count`
   end
 
   def >>(count)
-    `this >> count`
+    `#{self} >> count`
   end
 
   def +@
-    `+this`
+    `+#{self}`
   end
 
   def -@
-    `-this`
+    `-#{self}`
   end
 
   def ~
-    `~this`
+    `~#{self}`
   end
 
   def **(other)
-    `Math.pow(this, other)`
+    `Math.pow(#{self}, other)`
   end
 
   def ==(other)
-    `this == other`
+    `#{self} == other`
   end
 
   def <=>(other)
@@ -87,52 +87,52 @@ class Numeric < `Number`
         return nil;
       }
 
-      return this < other ? -1 : (this > other ? 1 : 0);
+      return #{self} < other ? -1 : (#{self} > other ? 1 : 0);
     }
   end
 
   def abs
-    `Math.abs(this)`
+    `Math.abs(#{self})`
   end
 
   def ceil
-    `Math.ceil(this)`
+    `Math.ceil(#{self})`
   end
 
   def chr
-    `String.fromCharCode(this)`
+    `String.fromCharCode(#{self})`
   end
 
   def downto(finish, &block)
     return enum_for :downto, finish unless block_given?
 
     %x{
-      for (var i = this; i >= finish; i--) {
+      for (var i = #{self}; i >= finish; i--) {
         if (block.call(__context, i) === __breaker) {
           return __breaker.$v;
         }
       }
 
-      return this;
+      return #{self};
     }
   end
 
   alias eql? ==
 
   def even?
-    `this % 2 === 0`
+    `#{self} % 2 === 0`
   end
 
   def floor
-    `Math.floor(this)`
+    `Math.floor(#{self})`
   end
 
   def hash
-    `this.toString()`
+    `#{self}.toString()`
   end
 
   def integer?
-    `this % 1 === 0`
+    `#{self} % 1 === 0`
   end
 
   alias magnitude abs
@@ -140,15 +140,15 @@ class Numeric < `Number`
   alias modulo %
 
   def next
-    `this + 1`
+    `#{self} + 1`
   end
 
   def nonzero?
-    `this.valueOf() === 0 ? nil : this`
+    `#{self}.valueOf() === 0 ? nil : #{self}`
   end
 
   def odd?
-    `this % 2 !== 0`
+    `#{self} % 2 !== 0`
   end
 
   def ord
@@ -156,7 +156,7 @@ class Numeric < `Number`
   end
 
   def pred
-    `this - 1`
+    `#{self} - 1`
   end
 
   alias succ next
@@ -165,30 +165,30 @@ class Numeric < `Number`
     return enum_for :times unless block_given?
 
     %x{
-      for (var i = 0; i <= this; i++) {
+      for (var i = 0; i <= #{self}; i++) {
         if (block.call(__context, i) === __breaker) {
           return __breaker.$v;
         }
       }
 
-      return this;
+      return #{self};
     }
   end
 
   def to_f
-    `parseFloat(this)`
+    `parseFloat(#{self})`
   end
 
   def to_i
-    `parseInt(this)`
+    `parseInt(#{self})`
   end
 
   def to_json
-    `this.toString()`
+    `#{self}.toString()`
   end
 
   def to_s(base = 10)
-    `this.toString()`
+    `#{self}.toString()`
   end
 
   def upto(finish, &block)
@@ -201,11 +201,11 @@ class Numeric < `Number`
         }
       }
 
-      return this;
+      return #{self};
     }
   end
 
   def zero?
-    `this == 0`
+    `#{self} == 0`
   end
 end