opal 1.6.1 → 1.7.0

data/opal/corelib/runtime.js

@@ -77,11 +77,12 @@
   };
 
   // Minify common function calls
-  var $has_own   = Object.hasOwnProperty;
+  var $call      = Function.prototype.call;
   var $bind      = Function.prototype.bind;
+  var $has_own   = Object.hasOwn || $call.bind(Object.prototype.hasOwnProperty);
   var $set_proto = Object.setPrototypeOf;
-  var $slice     = Array.prototype.slice;
-  var $splice    = Array.prototype.splice;
+  var $slice     = $call.bind(Array.prototype.slice);
+  var $splice    = $call.bind(Array.prototype.splice);
 
   // Nil object id is always 4
   var nil_id = 4;
@@ -129,6 +130,28 @@
     }
   };
 
+  // A helper function for raising things, that gracefully degrades if necessary
+  // functionality is not yet loaded.
+  function $raise(klass, message) {
+    // Raise Exception, so we can know that something wrong is going on.
+    if (!klass) klass = Opal.Exception || Error;
+
+    if (Kernel && Kernel.$raise) {
+      if (arguments.length > 2) {
+        Kernel.$raise(klass.$new.apply(klass, $slice(arguments, 1)));
+      }
+      else {
+        Kernel.$raise(klass, message);
+      }
+    }
+    else if (!klass.$new) {
+      throw new klass(message);
+    }
+    else {
+      throw klass.$new(message);
+    }
+  }
+
   function $prop(object, name, initialValue) {
     if (typeof(object) === "string") {
       // Special case for:
@@ -156,7 +179,6 @@
 
   Opal.slice = $slice;
 
-
   // Helpers
   // -----
 
@@ -173,12 +195,12 @@
 
     if (coerced && method) {
       coerced = coerced.$$class;
-      return Opal.TypeError.$new(
+      $raise(Opal.TypeError,
         "can't convert " + object + " into " + type +
         " (" + object + "#" + method + " gives " + coerced + ")"
       )
     } else {
-      return Opal.TypeError.$new(
+      $raise(Opal.TypeError,
         "no implicit conversion of " + object + " into " + type
       )
     }
@@ -197,13 +219,13 @@
 
     // Fast path for the most common situation
     if (object['$respond_to?'].$$pristine && object.$method_missing.$$pristine) {
-      body = object['$' + method];
-      if (body == null || body.$$stub) throw Opal.type_error(object, type);
+      body = object[$jsid(method)];
+      if (body == null || body.$$stub) Opal.type_error(object, type);
       return body.apply(object, args);
     }
 
     if (!object['$respond_to?'](method)) {
-      throw Opal.type_error(object, type);
+      Opal.type_error(object, type);
     }
 
     if (args == null) args = [];
@@ -312,7 +334,7 @@
     ancestors = $ancestors(cref);
 
     for (i = 0, ii = ancestors.length; i < ii; i++) {
-      if (ancestors[i].$$const && $has_own.call(ancestors[i].$$const, name)) {
+      if (ancestors[i].$$const && $has_own(ancestors[i].$$const, name)) {
         return ancestors[i].$$const[name];
       } else if (ancestors[i].$$autoload && ancestors[i].$$autoload[name]) {
         return handle_autoload(ancestors[i], name);
@@ -342,7 +364,7 @@
     if (cref === '::') cref = _Object;
 
     if (!cref.$$is_module && !cref.$$is_class) {
-      throw new Opal.TypeError(cref.toString() + " is not a class/module");
+      $raise(Opal.TypeError, cref.toString() + " is not a class/module");
     }
 
     result = const_get_name(cref, name);
@@ -367,7 +389,7 @@
     if (cref === '::') cref = _Object;
 
     if (!cref.$$is_module && !cref.$$is_class) {
-      throw new Opal.TypeError(cref.toString() + " is not a class/module");
+      $raise(Opal.TypeError, cref.toString() + " is not a class/module");
     }
 
     if ((cache = cref.$$const_cache) == null) {
@@ -418,6 +440,8 @@
   // Register the constant on a cref and opportunistically set the name of
   // unnamed classes/modules.
   function $const_set(cref, name, value) {
+    var new_const = true;
+
     if (cref == null || cref === '::') cref = _Object;
 
     if (value.$$is_a_module) {
@@ -426,6 +450,11 @@
     }
 
     cref.$$const = (cref.$$const || Object.create(null));
+
+    if (name in cref.$$const || ("$$autoload" in cref && name in cref.$$autoload)) {
+      new_const = false;
+    }
+
     cref.$$const[name] = value;
 
     // Add a short helper to navigate constants manually.
@@ -441,6 +470,10 @@
     // Name new class directly onto current scope (Opal.Foo.Baz = klass)
     $prop(cref, name, value);
 
+    if (new_const && cref.$const_added && !cref.$const_added.$$pristine) {
+      cref.$const_added(name);
+    }
+
     return value;
   };
 
@@ -490,7 +523,7 @@
       return nil;
     }
 
-    throw Opal.NameError.$new("constant "+cref+"::"+cref.$name()+" not defined");
+    $raise(Opal.NameError, "constant "+cref+"::"+cref.$name()+" not defined");
   };
 
   // Generates a function that is a curried const_get_relative.
@@ -540,7 +573,7 @@
       // Inheritance from bridged classes requires
       // calling original JS constructors
       klass = function() {
-        var args = $slice.call(arguments),
+        var args = $slice(arguments),
             self = new ($bind.apply(superclass.$$constructor, [null].concat(args)))();
 
         // and replacing a __proto__ manually
@@ -622,7 +655,7 @@
     if (klass) {
       // Make sure the existing constant is a class, or raise error
       if (!klass.$$is_class) {
-        throw Opal.TypeError.$new(name + " is not a class");
+        $raise(Opal.TypeError, name + " is not a class");
       }
 
       return klass;
@@ -631,7 +664,7 @@
 
   function ensureSuperclassMatch(klass, superclass) {
     if (klass.$$super !== superclass) {
-      throw Opal.TypeError.$new("superclass mismatch for class " + klass.$$name);
+      $raise(Opal.TypeError, "superclass mismatch for class " + klass.$$name);
     }
   }
 
@@ -656,7 +689,7 @@
         bridged = superclass;
         superclass = _Object;
       } else {
-        throw Opal.TypeError.$new("superclass must be a Class (" + (
+        $raise(Opal.TypeError, "superclass must be a Class (" + (
           (superclass.constructor && (superclass.constructor.name || superclass.constructor.$$name)) ||
           typeof(superclass)
         ) + " given)");
@@ -748,7 +781,7 @@
 
     if (module) {
       if (!module.$$is_module && module !== _Object) {
-        throw Opal.TypeError.$new(name + " is not a module");
+        $raise(Opal.TypeError, name + " is not a module");
       }
     }
 
@@ -999,7 +1032,7 @@
     for (i = length - 2; i >= 0; i--) {
       var ancestor = ancestors[i];
 
-      if ($has_own.call(ancestor.$$cvars, name)) {
+      if ($has_own(ancestor.$$cvars, name)) {
         ancestor.$$cvars[name] = value;
         return value;
       }
@@ -1015,7 +1048,7 @@
   // @param module [Module]
   // @param name [String]
   Opal.class_variable_get = function(module, name, tolerant) {
-    if ($has_own.call(module.$$cvars, name))
+    if ($has_own(module.$$cvars, name))
       return module.$$cvars[name];
 
     var ancestors = $ancestors(module),
@@ -1024,13 +1057,13 @@
     for (i = 0; i < length; i++) {
       var ancestor = ancestors[i];
 
-      if ($has_own.call(ancestor.$$cvars, name)) {
+      if ($has_own(ancestor.$$cvars, name)) {
         return ancestor.$$cvars[name];
       }
     }
 
     if (!tolerant)
-      throw Opal.NameError.$new('uninitialized class variable '+name+' in '+module.$name());
+      $raise(Opal.NameError, 'uninitialized class variable '+name+' in '+module.$name());
 
     return nil;
   }
@@ -1102,7 +1135,7 @@
     var iclasses = [];
 
     if (module_ancestors.indexOf(includer) !== -1) {
-      throw Opal.ArgumentError.$new('cyclic include detected');
+      $raise(Opal.ArgumentError, 'cyclic include detected');
     }
 
     for (var i = 0, length = module_ancestors.length; i < length; i++) {
@@ -1207,7 +1240,7 @@
     var iclasses = [];
 
     if (module_ancestors.indexOf(prepender) !== -1) {
-      throw Opal.ArgumentError.$new('cyclic prepend detected');
+      $raise(Opal.ArgumentError, 'cyclic prepend detected');
     }
 
     for (var i = 0, length = module_ancestors.length; i < length; i++) {
@@ -1263,7 +1296,7 @@
         end_chain_on = Object.getPrototypeOf(end_chain_on);
       }
     } else {
-      throw Opal.RuntimeError.$new("Prepending a module multiple times is not supported");
+      $raise(Opal.RuntimeError, "Prepending a module multiple times is not supported");
     }
 
     $set_proto(start_chain_after, chain.first);
@@ -1360,7 +1393,7 @@
   //
   Opal.bridge = function(native_klass, klass) {
     if (native_klass.hasOwnProperty('$$bridge')) {
-      throw Opal.ArgumentError.$new("already bridged");
+      $raise(Opal.ArgumentError, "already bridged");
     }
 
     // constructor is a JS function with a prototype chain like:
@@ -1478,7 +1511,7 @@
     stubs = stubs.split(',');
 
     for (var i = 0, length = stubs.length; i < length; i++) {
-      stub = '$'+stubs[i], existing_method = proto[stub];
+      stub = $jsid(stubs[i]), existing_method = proto[stub];
 
       if (existing_method == null || existing_method.$$stub) {
         Opal.add_stub_for(proto, stub);
@@ -1543,7 +1576,7 @@
     }
     inspect += meth;
 
-    throw Opal.ArgumentError.$new('[' + inspect + '] wrong number of arguments (given ' + actual + ', expected ' + expected + ')');
+    $raise(Opal.ArgumentError, '[' + inspect + '] wrong number of arguments (given ' + actual + ', expected ' + expected + ')');
   };
 
   // Arity count error dispatcher for blocks
@@ -1555,7 +1588,7 @@
   Opal.block_ac = function(actual, expected, context) {
     var inspect = "`block in " + context + "'";
 
-    throw Opal.ArgumentError.$new(inspect + ': wrong number of arguments (given ' + actual + ', expected ' + expected + ')');
+    $raise(Opal.ArgumentError, inspect + ': wrong number of arguments (given ' + actual + ', expected ' + expected + ')');
   };
 
   function get_ancestors(obj) {
@@ -1568,7 +1601,7 @@
 
   // Super dispatcher
   Opal.find_super = function(obj, mid, current_func, defcheck, allow_stubs) {
-    var jsid = '$' + mid, ancestors, super_method;
+    var jsid = $jsid(mid), ancestors, super_method;
 
     ancestors = get_ancestors(obj);
 
@@ -1590,7 +1623,7 @@
 
     if (!defcheck && super_method && super_method.$$stub && obj.$method_missing.$$pristine) {
       // method_missing hasn't been explicitly defined
-      throw Opal.NoMethodError.$new('super: no superclass method `'+mid+"' for "+obj, mid);
+      $raise(Opal.NoMethodError, 'super: no superclass method `'+mid+"' for "+obj, mid);
     }
 
     return (super_method.$$stub && !allow_stubs) ? null : super_method;
@@ -1601,11 +1634,11 @@
     var call_jsid = jsid;
 
     if (!current_func) {
-      throw Opal.RuntimeError.$new("super called outside of method");
+      $raise(Opal.RuntimeError, "super called outside of method");
     }
 
     if (implicit && current_func.$$define_meth) {
-      throw Opal.RuntimeError.$new(
+      $raise(Opal.RuntimeError,
         "implicit argument passing of super from method defined by define_method() is not supported. " +
         "Specify all arguments explicitly"
       );
@@ -1627,7 +1660,7 @@
   // handles yield calls for 1 yielded arg
   Opal.yield1 = function(block, arg) {
     if (typeof(block) !== "function") {
-      throw Opal.LocalJumpError.$new("no block given");
+      $raise(Opal.LocalJumpError, "no block given");
     }
 
     var has_mlhs = block.$$has_top_level_mlhs_arg,
@@ -1648,7 +1681,7 @@
   // handles yield for > 1 yielded arg
   Opal.yieldX = function(block, args) {
     if (typeof(block) !== "function") {
-      throw Opal.LocalJumpError.$new("no block given");
+      $raise(Opal.LocalJumpError, "no block given");
     }
 
     if (block.length > 1 && args.length === 1) {
@@ -1714,12 +1747,12 @@
         return hash;
       }
       else {
-        throw Opal.TypeError.$new("Can't convert " + value.$$class +
+        $raise(Opal.TypeError, "Can't convert " + value.$$class +
           " to Hash (" + value.$$class + "#to_hash gives " + hash.$$class + ")");
       }
     }
     else {
-      throw Opal.TypeError.$new("no implicit conversion of " + value.$$class + " into Hash");
+      $raise(Opal.TypeError, "no implicit conversion of " + value.$$class + " into Hash");
     }
   };
 
@@ -1742,7 +1775,7 @@
         return ary;
       }
       else {
-        throw Opal.TypeError.$new("Can't convert " + value.$$class +
+        $raise(Opal.TypeError, "Can't convert " + value.$$class +
           " to Array (" + value.$$class + "#to_ary gives " + ary.$$class + ")");
       }
     }
@@ -1766,7 +1799,7 @@
         return ary;
       }
       else {
-        throw Opal.TypeError.$new("Can't convert " + value.$$class +
+        $raise(Opal.TypeError, "Can't convert " + value.$$class +
           " to Array (" + value.$$class + "#to_a gives " + ary.$$class + ")");
       }
     }
@@ -1785,7 +1818,7 @@
   Opal.extract_kwargs = function(parameters) {
     var kwargs = parameters[parameters.length - 1];
     if (kwargs != null && Opal.respond_to(kwargs, '$to_hash', true)) {
-      $splice.call(parameters, parameters.length - 1);
+      $splice(parameters, parameters.length - 1);
       return kwargs;
     }
   };
@@ -1826,6 +1859,13 @@
     }
   }
 
+  // Optimization for a costly operation of prepending '$' to method names
+  var jsid_cache = {}
+  function $jsid(name) {
+    return jsid_cache[name] || (jsid_cache[name] = '$' + name);
+  }
+  Opal.jsid = $jsid;
+
   // Calls passed method on a ruby object with arguments and block:
   //
   // Can take a method or a method name.
@@ -1858,9 +1898,9 @@
       body = method;
       method = null;
     } else if (typeof(method) === 'string') {
-      body = recv['$'+method];
+      body = recv[$jsid(method)];
     } else {
-      throw Opal.NameError.$new("Passed method should be a string or a function");
+      $raise(Opal.NameError, "Passed method should be a string or a function");
     }
 
     return Opal.send2(recv, body, method, args, block, blockopts);
@@ -1905,8 +1945,8 @@
           refine_module = refine_modules[ancestor];
 
           // Does this module define a method we want to call?
-          if (typeof refine_module.$$prototype['$'+method] !== 'undefined') {
-            body = refine_module.$$prototype['$'+method];
+          if (typeof refine_module.$$prototype[$jsid(method)] !== 'undefined') {
+            body = refine_module.$$prototype[$jsid(method)];
             return Opal.send2(recv, body, method, args, block, blockopts);
           }
         }
@@ -2020,15 +2060,15 @@
     apply_blockopts(body, blockopts);
 
     if (obj.$$is_string || obj.$$is_number) {
-      throw Opal.TypeError.$new("can't define singleton");
+      $raise(Opal.TypeError, "can't define singleton");
     }
     return Opal.defn(Opal.get_singleton_class(obj), jsid, body);
   };
 
   // Called from #remove_method.
   Opal.rdef = function(obj, jsid) {
-    if (!$has_own.call(obj.$$prototype, jsid)) {
-      throw Opal.NameError.$new("method '" + jsid.substr(1) + "' not defined in " + obj.$name());
+    if (!$has_own(obj.$$prototype, jsid)) {
+      $raise(Opal.NameError, "method '" + jsid.substr(1) + "' not defined in " + obj.$name());
     }
 
     delete obj.$$prototype[jsid];
@@ -2048,7 +2088,7 @@
   // Called from #undef_method.
   Opal.udef = function(obj, jsid) {
     if (!obj.$$prototype[jsid] || obj.$$prototype[jsid].$$stub) {
-      throw Opal.NameError.$new("method '" + jsid.substr(1) + "' not defined in " + obj.$name());
+      $raise(Opal.NameError, "method '" + jsid.substr(1) + "' not defined in " + obj.$name());
     }
 
     Opal.add_stub_for(obj.$$prototype, jsid);
@@ -2070,8 +2110,8 @@
   }
 
   Opal.alias = function(obj, name, old) {
-    var id     = '$' + name,
-        old_id = '$' + old,
+    var id     = $jsid(name),
+        old_id = $jsid(old),
         body,
         alias;
 
@@ -2080,7 +2120,7 @@
       obj = Opal.Object;
     }
 
-    body = obj.$$prototype['$' + old];
+    body = obj.$$prototype[old_id];
 
     // When running inside #instance_eval the alias refers to class methods.
     if (obj.$$eval) {
@@ -2101,7 +2141,7 @@
       }
 
       if (!is_method_body(body)) {
-        throw Opal.NameError.$new("undefined method `" + old + "' for class `" + obj.$name() + "'")
+        $raise(Opal.NameError, "undefined method `" + old + "' for class `" + obj.$name() + "'")
       }
     }
 
@@ -2135,7 +2175,7 @@
     // Try to make the browser pick the right name
     alias.displayName       = name;
 
-    alias.$$arity           = body.$$arity;
+    alias.$$arity           = body.$$arity == null ? body.length : body.$$arity;
     alias.$$parameters      = body.$$parameters;
     alias.$$source_location = body.$$source_location;
     alias.$$alias_of        = body;
@@ -2161,11 +2201,11 @@
   }
 
   Opal.alias_native = function(obj, name, native_name) {
-    var id   = '$' + name,
+    var id   = $jsid(name),
         body = obj.$$prototype[native_name];
 
     if (typeof(body) !== "function" || body.$$stub) {
-      throw Opal.NameError.$new("undefined native method `" + native_name + "' for class `" + obj.$name() + "'")
+      $raise(Opal.NameError, "undefined native method `" + native_name + "' for class `" + obj.$name() + "'")
     }
 
     Opal.defn(obj, id, body);
@@ -2203,7 +2243,7 @@
 
   Opal.hash_put = function(hash, key, value) {
     if (key.$$is_string) {
-      if (!$has_own.call(hash.$$smap, key)) {
+      if (!$has_own(hash.$$smap, key)) {
         hash.$$keys.push(key);
       }
       hash.$$smap[key] = value;
@@ -2213,7 +2253,7 @@
     var key_hash, bucket, last_bucket;
     key_hash = hash.$$by_identity ? Opal.id(key) : key.$hash();
 
-    if (!$has_own.call(hash.$$map, key_hash)) {
+    if (!$has_own(hash.$$map, key_hash)) {
       bucket = {key: key, key_hash: key_hash, value: value};
       hash.$$keys.push(bucket);
       hash.$$map[key_hash] = bucket;
@@ -2241,7 +2281,7 @@
 
   Opal.hash_get = function(hash, key) {
     if (key.$$is_string) {
-      if ($has_own.call(hash.$$smap, key)) {
+      if ($has_own(hash.$$smap, key)) {
         return hash.$$smap[key];
       }
       return;
@@ -2250,7 +2290,7 @@
     var key_hash, bucket;
     key_hash = hash.$$by_identity ? Opal.id(key) : key.$hash();
 
-    if ($has_own.call(hash.$$map, key_hash)) {
+    if ($has_own(hash.$$map, key_hash)) {
       bucket = hash.$$map[key_hash];
 
       while (bucket) {
@@ -2268,7 +2308,7 @@
     if (key.$$is_string) {
       if (typeof key !== "string") key = key.valueOf();
 
-      if (!$has_own.call(hash.$$smap, key)) {
+      if (!$has_own(hash.$$smap, key)) {
         return;
       }
 
@@ -2292,7 +2332,7 @@
 
     var key_hash = key.$hash();
 
-    if (!$has_own.call(hash.$$map, key_hash)) {
+    if (!$has_own(hash.$$map, key_hash)) {
       return;
     }
 
@@ -2367,7 +2407,7 @@
 
       hash.$$keys[i].key_hash = key_hash;
 
-      if (!$has_own.call(hash.$$map, key_hash)) {
+      if (!$has_own(hash.$$map, key_hash)) {
         hash.$$map[key_hash] = hash.$$keys[i];
         continue;
       }
@@ -2408,7 +2448,7 @@
 
         for (i = 0; i < length; i++) {
           if (args[i].length !== 2) {
-            throw Opal.ArgumentError.$new("value not of length 2: " + args[i].$inspect());
+            $raise(Opal.ArgumentError, "value not of length 2: " + args[i].$inspect());
           }
 
           key = args[i][0];
@@ -2422,7 +2462,7 @@
       else {
         args = arguments[0];
         for (key in args) {
-          if ($has_own.call(args, key)) {
+          if ($has_own(args, key)) {
             value = args[key];
 
             Opal.hash_put(hash, key, value);
@@ -2434,7 +2474,7 @@
     }
 
     if (arguments_length % 2 !== 0) {
-      throw Opal.ArgumentError.$new("odd number of arguments for Hash");
+      $raise(Opal.ArgumentError, "odd number of arguments for Hash");
     }
 
     for (i = 0; i < arguments_length; i += 2) {
@@ -2499,7 +2539,7 @@
   // helper that can be used from methods
   function $deny_frozen_access(obj) {
     if (obj.$$frozen) {
-      throw Opal.FrozenError.$new("can't modify frozen " + (obj.$class()) + ": " + (obj), Opal.hash2(["receiver"], {"receiver": obj}));
+      $raise(Opal.FrozenError, "can't modify frozen " + (obj.$class()) + ": " + (obj), Opal.hash2(["receiver"], {"receiver": obj}));
     }
   };
   Opal.deny_frozen_access = $deny_frozen_access;
@@ -2701,11 +2741,7 @@
       var message  = 'cannot load such file -- ' + path;
 
       if (severity === "error") {
-        if (Opal.LoadError) {
-          throw Opal.LoadError.$new(message)
-        } else {
-          throw message
-        }
+        $raise(Opal.LoadError, message);
       }
       else if (severity === "warning") {
         console.warn('WARNING: LoadError: ' + message);
@@ -2746,7 +2782,7 @@
   Opal.set_encoding = function(str, name, type) {
     if (typeof type === "undefined") type = "encoding";
     if (typeof str === 'string' || str.$$frozen === true)
-      throw Opal.FrozenError.$new("can't modify frozen String");
+      $raise(Opal.FrozenError, "can't modify frozen String");
 
     var encoding = Opal.find_encoding(name);
 
@@ -2761,7 +2797,7 @@
   Opal.find_encoding = function(name) {
     var register = Opal.encodings;
     var encoding = register[name] || register[name.toUpperCase()];
-    if (!encoding) throw Opal.ArgumentError.$new("unknown encoding name - " + name);
+    if (!encoding) $raise(Opal.ArgumentError, "unknown encoding name - " + name);
     return encoding;
   }
 
@@ -2883,17 +2919,44 @@
     } else if (kwargs.$$is_hash) {
       return kwargs;
     } else {
-      throw Opal.ArgumentError.$new('expected kwargs');
+      $raise(Opal.ArgumentError, 'expected kwargs');
     }
   }
 
   Opal.get_kwarg = function(kwargs, key) {
-    if (!$has_own.call(kwargs.$$smap, key)) {
-      throw Opal.ArgumentError.$new('missing keyword: '+key);
+    if (!$has_own(kwargs.$$smap, key)) {
+      $raise(Opal.ArgumentError, 'missing keyword: '+key);
     }
     return kwargs.$$smap[key];
   }
 
+  // Arrays of size > 32 elements that contain only strings,
+  // symbols, integers and nils are compiled as a self-extracting
+  // string.
+  Opal.large_array_unpack = function(str) {
+    var array = str.split(","), length = array.length, i;
+    for (i = 0; i < length; i++) {
+      switch(array[i][0]) {
+        case undefined:
+          array[i] = nil
+          break;
+        case '-':
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+          array[i] = +array[i];
+      }
+    }
+    return array;
+  }
+
   // Initialization
   // --------------
   Opal.BasicObject = BasicObject = $allocate_class('BasicObject', null);
@@ -2949,7 +3012,7 @@
 
   // Foward calls to define_method on the top object to Object
   function top_define_method() {
-    var args = Opal.slice.call(arguments);
+    var args = $slice(arguments);
     var block = top_define_method.$$p;
     top_define_method.$$p = null;
     return Opal.send(_Object, 'define_method', args, block)
@@ -2960,7 +3023,7 @@
   $const_set(_Object, 'NilClass', Opal.NilClass);
   nil = Opal.nil = new Opal.NilClass();
   nil.$$id = nil_id;
-  nil.call = nil.apply = function() { throw Opal.LocalJumpError.$new('no block given'); };
+  nil.call = nil.apply = function() { $raise(Opal.LocalJumpError, 'no block given'); };
   nil.$$frozen = true;
   nil.$$comparable = false;
   Object.seal(nil);