opal 0.3.16 → 0.3.17

data/core/load_order

@@ -1,10 +1,10 @@
 alpha
 module
-class
 kernel
 basic_object
 object
 top_self
+class
 boolean
 nil_class
 enumerable
@@ -20,7 +20,4 @@ error
 regexp
 match_data
 time
-struct
-io
-file
-dir
+struct

data/core/match_data.rb

@@ -8,7 +8,7 @@ class MatchData
       }
 
       if (index >= length || index < 0) {
-        return nil;
+        return null;
       }
 
       return this.$data[index];

data/core/module.rb

@@ -1,10 +1,22 @@
 class Module
   def ===(object)
-    object.kind_of? self
+    %x{
+      var search = object._klass;
+
+      while (search) {
+        if (search === this) {
+          return true;
+        }
+
+        search = search._super;
+      }
+
+      return false;
+    }
   end
 
   def alias_method(newname, oldname)
-    `$opal.alias(this, newname, oldname)`
+    `opal.alias(this, newname, oldname)`
 
     self
   end
@@ -15,11 +27,16 @@ class Module
           result = [];
 
       while (parent) {
-        if (!(parent.$flags & FL_SINGLETON)) {
+        if (parent._flags & FL_SINGLETON) {
+          continue;
+        }
+        else if (parent._flags & T_ICLASS)
+          result.push(parent._klass);
+        else {
           result.push(parent);
         }
 
-        parent = parent.$s;
+        parent = parent._super;
       }
 
       return result;
@@ -46,8 +63,8 @@ class Module
 
       module.$included_in.push(klass);
 
-      var donator   = module.$allocator.prototype,
-          prototype = klass.$proto,
+      var donator   = module._alloc.prototype,
+          prototype = klass._proto,
           methods   = [];
 
       for (var method in donator) {
@@ -74,12 +91,12 @@ class Module
         define_method(klass, mid_to_jsid(name), function() {
           var res = this[name];
 
-          return res == null ? nil : res;
+          return res == null ? null : res;
         });
       }
 
       if (setter) {
-        define_method(klass, mid_to_jsid(name + '='), function(block, val) {
+        define_method(klass, mid_to_jsid(name + '='), function(val) {
           return this[name] = val;
         });
       }
@@ -92,7 +109,7 @@ class Module
         define_attr(this, attrs[i], true, true);
       }
 
-      return nil;
+      return null;
     }
   end
 
@@ -102,7 +119,7 @@ class Module
         define_attr(this, attrs[i], true, false);
       }
 
-      return nil;
+      return null;
     }
   end
 
@@ -112,7 +129,7 @@ class Module
         define_attr(this, attrs[i], false, true);
       }
 
-      return nil;
+      return null;
     }
   end
 
@@ -124,25 +141,28 @@ class Module
 
   def define_method(name, &body)
     %x{
-      if (body === nil) {
-        raise(RubyLocalJumpError, 'no block given');
+      if (body === null) {
+        throw RubyLocalJumpError.$new('no block given');
       }
 
-      define_method(this, mid_to_jsid(name), body);
+      var jsid = mid_to_jsid(name);
+
+      body.o$jsid = jsid;
+      define_method(this, jsid, body);
 
-      return nil;
+      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;
+      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;
+          dest = includee._proto;
           for (var j = 0, jj = methods.length; j < jj; j++) {
             method = methods[j];
             // if (!dest[method]) {
@@ -161,9 +181,14 @@ class Module
 
   def include(*mods)
     %x{
+      console.log("including " + this._name);
       var i = mods.length - 1, mod;
       while (i >= 0) {
         #{mod = `mods[i]`};
+        console.log("include: " + mod._name);
+
+        define_iclass(this, mod);
+
         #{mod.append_features self};
         #{mod.included self};
 
@@ -184,8 +209,8 @@ class Module
 
   def module_eval(&block)
     %x{
-      if (block === nil) {
-        raise(RubyLocalJumpError, 'no block given');
+      if (block === null) {
+        throw RubyLocalJumpError.$new('no block given');
       }
 
       return block.call(this, null);
@@ -195,7 +220,7 @@ class Module
   alias class_eval module_eval
 
   def name
-    `this.$name`
+    `this._name`
   end
 
   alias public_instance_methods instance_methods

data/core/nil_class.rb

@@ -12,7 +12,7 @@ class NilClass
   end
 
   def ==(other)
-    `this === other`
+    `other === nil`
   end
 
   def inspect
@@ -23,6 +23,10 @@ class NilClass
     true
   end
 
+  def singleton_class
+    NilClass
+  end
+
   def to_a
     []
   end
@@ -38,4 +42,4 @@ class NilClass
   end
 end
 
-NIL = nil
+NIL = nil

data/core/numeric.rb

@@ -1,4 +1,6 @@
 class Numeric
+  include Comparable
+
   def +(other)
     `this + other`
   end
@@ -72,13 +74,13 @@ class Numeric
   end
 
   def ==(other)
-    `this.valueOf() === other.valueOf()`
+    `this == other`
   end
 
   def <=>(other)
     %x{
       if (typeof(other) !== 'number') {
-        return nil;
+        return null;
       }
 
       return this < other ? -1 : (this > other ? 1 : 0);
@@ -93,13 +95,17 @@ class Numeric
     `Math.ceil(this)`
   end
 
+  def chr
+    `String.fromCharCode(this)`
+  end
+
   def downto(finish, &block)
     return enum_for :downto, finish unless block_given?
 
     %x{
       for (var i = this; i >= finish; i--) {
-        if ($yield.call($context, i) === $breaker) {
-          return $breaker.$v;
+        if (block.call(__context, i) === __breaker) {
+          return __breaker.$v;
         }
       }
 
@@ -132,13 +138,17 @@ class Numeric
   end
 
   def nonzero?
-    `this.valueOf() === 0 ? nil : this`
+    `this.valueOf() === 0 ? null : this`
   end
 
   def odd?
     `this % 2 !== 0`
   end
 
+  def ord
+    self
+  end
+
   def pred
     `this - 1`
   end
@@ -150,8 +160,8 @@ class Numeric
 
     %x{
       for (var i = 0; i <= this; i++) {
-        if ($yield.call($context, i) === $breaker) {
-          return $breaker.$v;
+        if (block.call(__context, i) === __breaker) {
+          return __breaker.$v;
         }
       }
 
@@ -168,7 +178,7 @@ class Numeric
   end
 
   def to_s(base = 10)
-    `this.toString(base)`
+    `this.toString()`
   end
 
   def upto(finish, &block)
@@ -176,8 +186,8 @@ class Numeric
 
     %x{
       for (var i = 0; i <= finish; i++) {
-        if ($yield.call($context, i) === $breaker) {
-          return $breaker.$v;
+        if (block.call(__context, i) === __breaker) {
+          return __breaker.$v;
         }
       }
 

data/core/proc.rb

@@ -10,7 +10,7 @@ class Proc
   end
 
   def call(*args)
-    `this.apply(this.$S, args)`
+    `this.apply(this._s, #{args})`
   end
 
   def to_proc
@@ -28,4 +28,4 @@ class Proc
   def arity
     `this.length - 1`
   end
-end
+end

data/core/range.rb

@@ -1,7 +1,7 @@
 # Helper function on runtime for creating range literals
 %x{
-  $opal.range = function(beg, end, exc) {
-    var range         = new RubyRange.$allocator();
+  Opal.range = function(beg, end, exc) {
+    var range         = new RubyRange._alloc();
         range.begin   = beg;
         range.end     = end;
         range.exclude = exc;
@@ -11,33 +11,92 @@
 }
 
 class Range
+  include Enumerable
+
+  def initialize(min, max, exclude = false)
+    @begin   = min
+    @end     = max
+    @exclude = exclude
+  end
+
+  def ==(other)
+    return false unless Range === other
+
+    exclude_end? == other.exclude_end? && `this.begin` == other.begin && `this.end` == other.end
+  end
+
+  # FIXME: currently hardcoded to assume range holds numerics
+  def ===(obj)
+    `return obj >= this.begin && obj <= this.end`
+  end
+
   def begin
     `this.begin`
   end
 
+  def cover?(value)
+    `this.begin` <= value && value <= (exclude_end? ? `this.end` - 1 : `this.end`)
+  end
+
+  def each
+    return enum_for :each unless block_given?
+
+    current = min
+
+    while current != max
+      yield current
+
+      current = current.succ
+    end
+
+    yield current unless exclude_end?
+
+    self
+  end
+
   def end
     `this.end`
   end
 
-  alias first begin
-  alias min begin
+  def eql?(other)
+    return false unless Range === other
 
-  alias last end
-  alias max end
+    exclude_end? == other.exclude_end? && `this.begin`.eql?(other.begin) && `this.end`.eql?(other.end)
+  end
 
-  def initialize(min, max, exclude = false)
-    @begin   = min
-    @end     = max
-    @exclude = exclude
+  def exclude_end?
+    `this.exclude`
   end
 
   # FIXME: currently hardcoded to assume range holds numerics
-  def ===(obj)
+  def include?(val)
     `return obj >= this.begin && obj <= this.end`
   end
 
-  def exclude_end?
-    `this.exclude`
+  def max
+    if block_given?
+      # I actually don't get what this should do
+      raise NotImplementedError
+    else
+      `this.end`
+    end
+  end
+
+  def min
+    if block_given?
+      # I actually don't get what this should do
+      raise NotImplementedError
+    else
+      `this.begin`
+    end
+  end
+
+  alias member? include?
+
+  def step(n = 1)
+    return enum_for :step, n unless block_given?
+
+    raise NotImplementedError
   end
 
   def to_s

data/core/regexp.rb

@@ -20,8 +20,9 @@ class Regexp
       var result = this.exec(string);
 
       if (result) {
-        var match = new RubyMatch.$allocator();
-        match.$data = result;
+        var match       = new RubyMatch._alloc();
+            match.$data = result;
+
         #{$~ = `match`};
       }
       else {
@@ -43,8 +44,9 @@ class Regexp
       var result  = this.exec(pattern);
 
       if (result) {
-        var match   = new RubyMatch.$allocator();
+        var match   = new RubyMatch._alloc();
         match.$data = result;
+
         return #{$~ = `match`};
       }
       else {