opal 0.3.44 → 0.4.0

data/opal/opal/proc.rb

@@ -35,6 +35,10 @@ class Proc
   def arity
     `#{self}.length - 1`
   end
+
+  def to_n
+    self
+  end
 end
 
 class Method < Proc; end

data/opal/opal/range.rb

@@ -86,4 +86,4 @@ class Range
   end
 
   alias inspect to_s
-end
+end

data/opal/opal/regexp.rb

@@ -1,17 +1,21 @@
 class Regexp
+  `def._isRegexp = true`
+
   def self.escape(string)
     `string.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\^\\$\\|]/g, '\\\\$&')`
   end
 
   def self.new(regexp, options = undefined)
-    `new RegExp(regexp, options)`
+    `options? new RegExp(regexp, options) : new RegExp(regexp)`
   end
 
   def ==(other)
     `other.constructor == RegExp && #{self}.toString() === other.toString()`
   end
 
-  alias_native :===, :test
+  def ===(str)
+    `#{self}.test(str)`
+  end
 
   def =~(string)
     %x{
@@ -40,7 +44,9 @@ class Regexp
 
   alias eql? ==
 
-  alias_native :inspect, :toString
+  def inspect
+    `#{self}.toString()`
+  end
 
   def match(string, pos = undefined)
     %x{
@@ -69,4 +75,8 @@ class Regexp
   end
 
   alias to_s source
+
+  def to_n
+    self
+  end
 end

data/opal/opal/runtime.js

@@ -78,7 +78,7 @@
   Opal.klass = function(base, superklass, id, constructor) {
     var klass;
     if (typeof(base) !== 'function') {
-      base = base._klass;
+      base = base.constructor;
     }
 
     if (superklass === null) {
@@ -87,16 +87,17 @@
 
     if (__hasOwn.call(base._scope, id)) {
       klass = base._scope[id];
-    }
-    else {
-      if (!superklass._methods) {
-        var bridged = superklass;
-        superklass  = Object;
-        klass       = bridge_class(bridged);
+
+      if (typeof klass !== 'function') {
+        throw Opal.TypeError.$new(id + " is not a class");
       }
-      else {
-        klass = boot_class(superklass, constructor);
+
+      if (superklass !== klass._super && superklass !== Object) {
+        throw Opal.TypeError.$new("superclass mismatch for class " + id);
       }
+    }
+    else {
+      klass = boot_class(superklass, constructor);
 
       klass._name = (base === Object ? id : base._name + '::' + id);
 
@@ -116,23 +117,28 @@
   Opal.module = function(base, id, constructor) {
     var klass;
     if (typeof(base) !== 'function') {
-      base = base._klass;
+      base = base.constructor;
     }
 
     if (__hasOwn.call(base._scope, id)) {
       klass = base._scope[id];
+
+      if (!klass._mod$ && klass !== Object) {
+        throw Opal.TypeError.$new(id + " is not a module")
+      }
     }
     else {
       klass = boot_class(Class, constructor);
       klass._name = (base === Object ? id : base._name + '::' + id);
+      klass._mod$ = true;
 
-      klass.$included_in = [];
+      klass._included_in = [];
 
       create_scope(base._scope, klass, id);
     }
 
     return klass;
-  }
+  };
 
   // Utility function to raise a "no block given" error
   var no_block_given = function() {
@@ -151,10 +157,8 @@
     var prototype = constructor.prototype;
 
     prototype.constructor = constructor;
-    prototype._klass      = constructor;
+    prototype.constructor      = constructor;
 
-    constructor._inherited    = [];
-    constructor._included_in  = [];
     constructor._name         = id;
     constructor._super        = superklass;
     constructor._methods      = [];
@@ -177,21 +181,18 @@
     constructor.prototype = new ctor();
     var prototype = constructor.prototype;
 
-    prototype._klass      = constructor;
     prototype.constructor = constructor;
 
-    constructor._inherited    = [];
-    constructor._included_in  = [];
     constructor._super        = superklass;
     constructor._methods      = [];
-    constructor._klass        = Class;
+    constructor.constructor   = Class;
 
-    constructor['$==='] = module_eqq;
-    constructor.$to_s = module_to_s;
+    constructor['$===']  = module_eqq;
+    constructor.$to_s    = module_to_s;
     constructor.toString = module_to_s;
 
     constructor['$[]'] = undefined;
-    constructor['$call'] = undefined;
+    constructor.$call  = undefined;
 
     var smethods;
 
@@ -203,28 +204,34 @@
       constructor[m] = superklass[m];
     }
 
-    superklass._inherited.push(constructor);
+    var inherited = superklass._inherited;
+
+    if (!inherited) {
+      inherited = superklass._inherited = [];
+    }
+
+    inherited.push(constructor);
 
     return constructor;
   };
 
   var bridge_class = function(constructor) {
-    constructor.prototype._klass = constructor;
+    var i, length, m;
+
+    constructor.prototype.constructor = constructor;
 
-    constructor._inherited    = [];
-    constructor._included_in  = [];
     constructor._super        = Object;
-    constructor._klass        = Class;
+    constructor.constructor   = Class;
     constructor._methods      = [];
     constructor._smethods     = [];
 
-    constructor['$==='] = module_eqq;
-    constructor.$to_s = module_to_s;
+    constructor['$===']  = module_eqq;
+    constructor.$to_s    = module_to_s;
     constructor.toString = module_to_s;
 
     var smethods = constructor._smethods = Class._methods.slice();
-    for (var i = 0, length = smethods.length; i < length; i++) {
-      var m = smethods[i];
+    for (i = 0, length = smethods.length; i < length; i++) {
+      m = smethods[i];
       constructor[m] = Object[m];
     }
 
@@ -232,8 +239,8 @@
 
     var table = Object.prototype, methods = Object._methods;
 
-    for (var i = 0, length = methods.length; i < length; i++) {
-      var m = methods[i];
+    for (i = 0, length = methods.length; i < length; i++) {
+      m = methods[i];
       constructor.prototype[m] = table[m];
     }
 
@@ -244,6 +251,25 @@
 
   Opal.puts = function(a) { console.log(a); };
 
+  var native_singleton = {
+    _scope: Opal,
+    prototype: null
+  };
+
+  // Singleton class
+  Opal.singleton = function(obj) {
+    if (obj == null) {
+      return Opal.NilClass;
+    }
+    else if (obj.$singleton_class) {
+      return obj.$singleton_class();
+    }
+    else {
+      native_singleton.prototype = obj;
+      return native_singleton;
+    }
+  };
+
   // Method missing dispatcher
   Opal.mm = function(mid) {
     var dispatcher = function() {
@@ -254,6 +280,7 @@
         return this.$method_missing.apply(this, [mid].concat(args));
       }
       else {
+        native_send._p = dispatcher._p;
         return native_send(this, mid, args);
       }
     };
@@ -266,25 +293,31 @@
     var prop, block = native_send._p;
     native_send._p = null;
 
-    if (prop = native_methods[mid]) {
+    if ( (prop = native_methods[mid]) ) {
       return prop(obj, args, block);
     }
 
     prop = obj[mid];
 
     if (typeof(prop) === "function") {
-      prop = prop.apply(obj, args.$to_native());
+      prop = prop.apply(obj, args.$to_n());
     }
     else if (mid.charAt(mid.length - 1) === "=") {
       prop = mid.slice(0, mid.length - 1);
+
+      if (args[0] === nil) {
+        obj[prop] = null;
+        return nil;
+      }
+
       return obj[prop] = args[0];
     }
 
-    if (prop != null) {
-      return prop;
+    if (prop == null) {
+      return nil;
     }
 
-    return nil;
+    return prop;
   };
 
   var native_methods = {
@@ -295,11 +328,29 @@
     "[]": function(obj, args) {
       var prop = obj[args[0]];
 
-      if (prop != null) {
-        return prop;
+      if (prop == null) {
+        return nil;
       }
 
-      return nil;
+      return prop;
+    },
+
+    "[]=": function(obj, args) {
+      var value = args[1];
+
+      if (value === nil) {
+        value = null;
+      }
+
+      return obj[args[0]] = value;
+    },
+
+    "inspect": function(obj) {
+      return obj.toString();
+    },
+
+    "to_s": function(obj) {
+      return obj.toString();
     },
 
     "respond_to?": function(obj, args) {
@@ -343,6 +394,23 @@
       }
 
       return result;
+    },
+
+    "to_h": function(obj) {
+      var keys = [], values = {}, value;
+
+      for (var key in obj) {
+        value = obj[key];
+        keys.push(key);
+
+        if (value == null) {
+          value = nil;
+        }
+
+        values[key] = value;
+      }
+
+      return Opal.hash2(keys, values);
     }
   };
 
@@ -353,8 +421,8 @@
 
   // Arity count error dispatcher
   Opal.ac = function(actual, expected, object, meth) {
-    var inspect = ((typeof(object) !== 'function') ? object._klass._name + '#' : object._name + '.') + meth;
-    var msg = '[' + inspect + '] wrong number of arguments(' + actual + ' for ' + expected + ')'
+    var inspect = ((typeof(object) !== 'function') ? object.constructor._name + '#' : object._name + '.') + meth;
+    var msg = '[' + inspect + '] wrong number of arguments(' + actual + ' for ' + expected + ')';
     throw Opal.ArgumentError.$new(msg);
   };
 
@@ -384,13 +452,25 @@
     return recv.$method_missing.apply(recv, [mid].concat(args));
   };
 
+  Opal.block_send = function(recv, mid, block) {
+    var args = __slice.call(arguments, 3),
+        func = recv['$' + mid];
+
+    if (func) {
+      func._p = block;
+      return func.apply(recv, args);
+    }
+
+    return recv.$method_missing.apply(recv, [mid].concat(args));
+  };
+
   // Implementation of Class#===
   function module_eqq(object) {
     if (object == null) {
       return false;
     }
 
-    var search = object._klass;
+    var search = object.constructor;
 
     while (search) {
       if (search === this) {
@@ -412,7 +492,7 @@
    * Donate methods for a class/module
    */
   Opal.donate = function(klass, defined, indirect) {
-    var methods = klass._methods, included_in = klass.$included_in;
+    var methods = klass._methods, included_in = klass._included_in;
 
     // if (!indirect) {
       klass._methods = methods.concat(defined);
@@ -428,7 +508,7 @@
           dest[method] = klass.prototype[method];
         }
 
-        if (includee.$included_in) {
+        if (includee._included_in) {
           Opal.donate(includee, defined, true);
         }
       }
@@ -449,7 +529,7 @@
     klass[mid] = body;
 
     var inherited = klass._inherited;
-    if (inherited.length) {
+    if (inherited && inherited.length) {
       for (var i = 0, length = inherited.length, subclass; i < length; i++) {
         subclass = inherited[i];
         if (!subclass[mid]) {
@@ -468,16 +548,16 @@
   // Initialization
   // --------------
 
-  boot_defclass('BasicObject', BasicObject)
+  boot_defclass('BasicObject', BasicObject);
   boot_defclass('Object', Object, BasicObject);
   boot_defclass('Class', Class, Object);
 
   Class.prototype = Function.prototype;
 
-  BasicObject._klass = Object._klass = Class._klass = Class;
+  BasicObject.constructor = Object.constructor = Class.constructor = Class;
 
 
-  var bridged_classes = Object.$included_in = [];
+  var bridged_classes = Object._included_in = [];
 
   Opal.base = Object;
   BasicObject._scope = Object._scope = Opal;
@@ -492,7 +572,8 @@
 
   Opal.top = new Object;
 
-  Opal.klass(Object, Object, 'NilClass', NilClass)
+  Opal.klass(Object, Object, 'NilClass', NilClass);
+
   var nil = Opal.nil = new NilClass;
   nil.call = nil.apply = function() { throw Opal.LocalJumpError.$new('no block given'); };
 
@@ -506,4 +587,6 @@
   Opal.bridge('Exception', Error);
   Opal.bridge('Regexp', RegExp);
   Opal.bridge('Time', Date);
+
+  TypeError._super = Error;
 }).call(this);

data/opal/opal/string.rb

@@ -197,7 +197,7 @@ class String
             var result = #{self}.substr(0, strlen - 1);
             if (strlen > 1 && #{self}.charAt(strlen - 2) === "\\r") {
               result = #{self}.substr(0, strlen - 2);
-            } 
+            }
             return result;
           }
         }
@@ -233,7 +233,9 @@ class String
 
   alias dup clone
 
-  alias_native :downcase, :toLowerCase
+  def downcase
+    `#{self}.toLowerCase()`
+  end
 
   alias each_char chars
 
@@ -294,7 +296,9 @@ class String
     `#{self}.toString() === val.toString()`
   end
 
-  alias_native :getbyte, :charCodeAt
+  def getbyte(idx)
+    `#{self}.charCodeAt(idx)`
+  end
 
   def gsub(pattern, replace = undefined, &block)
     if pattern.is_a?(String)
@@ -311,7 +315,9 @@ class String
     }
   end
 
-  alias_native :hash, :toString
+  def hash
+    `#{self}.toString()`
+  end
 
   def hex
     to_i 16
@@ -321,36 +327,37 @@ class String
     `#{self}.indexOf(other) !== -1`
   end
 
-  def index(what, offset)
+  def index(what, offset = nil)
     %x{
-      if (!what._isString && !what._isRegexp) {
-        throw new Error('type mismatch');
+      if ( !(what != null && (what._isString || what._isRegexp)) ) {
+        #{raise TypeError, 'type mismatch'};
       }
 
       var result = -1;
 
       if (offset != null) {
         if (offset < 0) {
-          offset = #{self}.length - offset;
+          offset = offset + #{self}.length;
+        }
+
+        if (offset > #{self}.length) {
+          return nil;
         }
 
         if (#{what.is_a?(Regexp)}) {
           result = #{what =~ `#{self}.substr(offset)` || -1}
-        }
-        else {
-          result = #{self}.substr(offset).indexOf(substr);
+        } else {
+          result = #{self}.substr(offset).indexOf(#{what});
         }
 
         if (result !== -1) {
           result += offset;
         }
-      }
-      else {
+      } else {
         if (#{what.is_a?(Regexp)}) {
           result = #{(what =~ self) || -1}
-        }
-        else {
-          result = #{self}.indexOf(substr);
+        } else {
+          result = #{self}.indexOf(#{what});
         }
       }
 
@@ -479,7 +486,7 @@ class String
           result = #{self}.lastIndexOf(search);
         }
         else {
-          result = #{self}.$reverse().search(search); 
+          result = #{self}.$reverse().search(search);
           if (result !== -1) {
             result = #{self}.length - 1 - result;
           }
@@ -638,7 +645,7 @@ class String
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
 
-      if (#{self}._klass === String) {
+      if (#{self}.constructor === String) {
         return str;
       }
 
@@ -689,7 +696,9 @@ class String
     }
   end
 
-  alias_native :to_s, :toString
+  def to_s
+    `#{self}.toString()`
+  end
 
   alias to_str to_s
 
@@ -809,7 +818,7 @@ class String
             to_chars.push(pad_char);
           }
         }
-        
+
         for (var i = 0; i < from_length; i++) {
           subs[from_chars[i]] = to_chars[i];
         }
@@ -944,7 +953,7 @@ class String
             to_chars.push(pad_char);
           }
         }
-        
+
         for (var i = 0; i < from_length; i++) {
           subs[from_chars[i]] = to_chars[i];
         }
@@ -983,7 +992,17 @@ class String
     }
   end
 
-  alias_native :upcase, :toUpperCase
+  def upcase
+    `#{self}.toUpperCase()`
+  end
+
+  def freeze
+    self
+  end
+
+  def frozen?
+    true
+  end
 end
 
 Symbol = String
@@ -1042,6 +1061,10 @@ class MatchData < Array
     `#{self}[0]`
   end
 
+  def to_n
+    self
+  end
+
   def values_at(*indexes)
     %x{
       var vals = [];