opal 1.5.1 → 1.6.0.alpha1

data/opal/corelib/runtime.js

@@ -23,10 +23,12 @@
   else if (typeof(window) !== 'undefined') { global_object = window; }
 
   // Setup a dummy console object if missing
+  if (global_object.console == null) {
+    global_object.console = {};
+  }
+
   if (typeof(global_object.console) === 'object') {
     console = global_object.console;
-  } else if (global_object.console == null) {
-    console = global_object.console = {};
   } else {
     console = {};
   }
@@ -65,7 +67,6 @@
 
   // This is a useful reference to global object inside ruby files
   Opal.global = global_object;
-  global_object.Opal = Opal;
 
   // Configure runtime behavior with regards to require and unsupported features
   Opal.config = {
@@ -90,27 +91,27 @@
   var unique_id = nil_id;
 
   // Return next unique id
-  Opal.uid = function() {
+  function $uid() {
     unique_id += 2;
     return unique_id;
   };
+  Opal.uid = $uid;
 
   // Retrieve or assign the id of an object
   Opal.id = function(obj) {
     if (obj.$$is_number) return (obj * 2)+1;
-    if (obj.$$id != null) {
-      return obj.$$id;
+    if (obj.$$id == null) {
+      $prop(obj, '$$id', $uid());
     }
-    $prop(obj, '$$id', Opal.uid());
     return obj.$$id;
   };
 
   // Globals table
-  Opal.gvars = {};
+  var $gvars = Opal.gvars = {};
 
   // Exit function, this should be replaced by platform specific implementation
   // (See nodejs and chrome for examples)
-  Opal.exit = function(status) { if (Opal.gvars.DEBUG) console.log('Exited with status '+status); };
+  Opal.exit = function(status) { if ($gvars.DEBUG) console.log('Exited with status '+status); };
 
   // keeps track of exceptions for $!
   Opal.exceptions = [];
@@ -120,11 +121,11 @@
   Opal.pop_exception = function() {
     var exception = Opal.exceptions.pop();
     if (exception) {
-      Opal.gvars["!"] = exception;
-      Opal.gvars["@"] = exception.$backtrace();
+      $gvars["!"] = exception;
+      $gvars["@"] = exception.$backtrace();
     }
     else {
-      Opal.gvars["!"] = Opal.gvars["@"] = nil;
+      $gvars["!"] = $gvars["@"] = nil;
     }
   };
 
@@ -308,7 +309,7 @@
 
     if (cref == null) return;
 
-    ancestors = Opal.ancestors(cref);
+    ancestors = $ancestors(cref);
 
     for (i = 0, ii = ancestors.length; i < ii; i++) {
       if (ancestors[i].$$const && $has_own.call(ancestors[i].$$const, name)) {
@@ -328,10 +329,8 @@
   }
 
   // Call const_missing if nothing else worked
-  function const_missing(cref, name, skip_missing) {
-    if (!skip_missing) {
-      return (cref || _Object).$const_missing(name);
-    }
+  function const_missing(cref, name) {
+    return (cref || _Object).$const_missing(name);
   }
 
   // Look for the constant just in the current cref or call `#const_missing`
@@ -346,8 +345,8 @@
       throw new Opal.TypeError(cref.toString() + " is not a class/module");
     }
 
-    result = const_get_name(cref, name);              if (result != null) return result;
-    result = const_missing(cref, name, skip_missing); if (result != null) return result;
+    result = const_get_name(cref, name);
+    return result != null || skip_missing ? result : const_missing(cref, name);
   };
 
   // Look for the constant relative to a cref or call `#const_missing` (when the
@@ -385,7 +384,7 @@
       result = cached[1];
     }
 
-    return result != null ? result : const_missing(cref, name, skip_missing);
+    return result != null || skip_missing ? result : const_missing(cref, name);
   };
 
   // Initialize the top level constant cache generation counter
@@ -413,7 +412,7 @@
       result = cached[1];
     }
 
-    return result != null ? result : const_missing(cref, name, skip_missing);
+    return result != null || skip_missing ? result : const_missing(cref, name);
   };
 
   // Register the constant on a cref and opportunistically set the name of
@@ -454,8 +453,8 @@
 
     var module, modules = [cref], i, ii, constants = {}, constant;
 
-    if (inherit) modules = modules.concat(Opal.ancestors(cref));
-    if (inherit && cref.$$is_module) modules = modules.concat([Opal.Object]).concat(Opal.ancestors(Opal.Object));
+    if (inherit) modules = modules.concat($ancestors(cref));
+    if (inherit && cref.$$is_module) modules = modules.concat([Opal.Object]).concat($ancestors(Opal.Object));
 
     for (i = 0, ii = modules.length; i < ii; i++) {
       module = modules[i];
@@ -534,13 +533,13 @@
   //
   // @return new [Class]  or existing ruby class
   //
-  Opal.allocate_class = function(name, superclass, singleton) {
-    var klass, constructor;
+  function $allocate_class(name, superclass, singleton) {
+    var klass;
 
     if (superclass != null && superclass.$$bridge) {
       // Inheritance from bridged classes requires
       // calling original JS constructors
-      constructor = function() {
+      klass = function() {
         var args = $slice.call(arguments),
             self = new ($bind.apply(superclass.$$constructor, [null].concat(args)))();
 
@@ -549,18 +548,16 @@
         return self;
       }
     } else {
-      constructor = function(){};
+      klass = function(){};
     }
 
     if (name && name !== nil) {
-      $prop(constructor, 'displayName', '::'+name);
+      $prop(klass, 'displayName', '::'+name);
     }
 
-    klass = constructor;
-
     $prop(klass, '$$name', name);
-    $prop(klass, '$$constructor', constructor);
-    $prop(klass, '$$prototype', constructor.prototype);
+    $prop(klass, '$$constructor', klass);
+    $prop(klass, '$$prototype', klass.prototype);
     $prop(klass, '$$const', {});
     $prop(klass, '$$is_class', true);
     $prop(klass, '$$is_a_module', true);
@@ -614,6 +611,7 @@
 
     return klass;
   };
+  Opal.allocate_class = $allocate_class;
 
 
   function find_existing_class(scope, name) {
@@ -667,35 +665,32 @@
 
     var klass = find_existing_class(scope, name);
 
-    if (klass) {
+    if (klass != null) {
       if (superclass) {
         // Make sure existing class has same superclass
         ensureSuperclassMatch(klass, superclass);
       }
-
-      if (Opal.trace_class) { invoke_tracers_for_class(klass); }
-
-      return klass;
     }
+    else {
+      // Class doesn't exist, create a new one with given superclass...
 
-    // Class doesn't exist, create a new one with given superclass...
-
-    // Not specifying a superclass means we can assume it to be Object
-    if (superclass == null) {
-      superclass = _Object;
-    }
+      // Not specifying a superclass means we can assume it to be Object
+      if (superclass == null) {
+        superclass = _Object;
+      }
 
-    // Create the class object (instance of Class)
-    klass = Opal.allocate_class(name, superclass);
-    $const_set(scope, name, klass);
+      // Create the class object (instance of Class)
+      klass = $allocate_class(name, superclass);
+      $const_set(scope, name, klass);
 
-    // Call .inherited() hook with new class on the superclass
-    if (superclass.$inherited) {
-      superclass.$inherited(klass);
-    }
+      // Call .inherited() hook with new class on the superclass
+      if (superclass.$inherited) {
+        superclass.$inherited(klass);
+      }
 
-    if (bridged) {
-      Opal.bridge(bridged, klass);
+      if (bridged) {
+        Opal.bridge(bridged, klass);
+      }
     }
 
     if (Opal.trace_class) { invoke_tracers_for_class(klass); }
@@ -722,12 +717,8 @@
   // @param  id   [String] the name of the new (or existing) module
   //
   // @return [Module]
-  Opal.allocate_module = function(name) {
+  function $allocate_module(name) {
     var constructor = function(){};
-    if (name) {
-      $prop(constructor, 'displayName', name+'.$$constructor');
-    }
-
     var module = constructor;
 
     if (name)
@@ -749,6 +740,7 @@
 
     return module;
   };
+  Opal.allocate_module = $allocate_module;
 
   function find_existing_module(scope, name) {
     var module = const_get_name(scope, name);
@@ -776,17 +768,12 @@
 
     module = find_existing_module(scope, name);
 
-    if (module) {
-
-      if (Opal.trace_class) { invoke_tracers_for_class(module); }
-
-      return module;
+    if (module == null) {
+      // Module doesnt exist, create a new one...
+      module = $allocate_module(name);
+      $const_set(scope, name, module);
     }
 
-    // Module doesnt exist, create a new one...
-    module = Opal.allocate_module(name);
-    $const_set(scope, name, module);
-
     if (Opal.trace_class) { invoke_tracers_for_class(module); }
 
     return module;
@@ -817,6 +804,23 @@
     }
   };
 
+  // helper to set $$meta on klass, module or instance
+  function set_meta(obj, meta) {
+    if (obj.hasOwnProperty('$$meta')) {
+      obj.$$meta = meta;
+    } else {
+      $prop(obj, '$$meta', meta);
+    }
+    if (obj.$$frozen) {
+      // If a object is frozen (sealed), freeze $$meta too.
+      // No need to inject $$meta.$$prototype in the prototype chain,
+      // as $$meta cannot be modified anyway.
+      obj.$$meta.$freeze();
+    } else {
+      $set_proto(obj, meta.$$prototype);
+    }
+  };
+
   // Build the singleton class for an existing class. Class object are built
   // with their singleton class already in the prototype chain and inheriting
   // from their superclass object (up to `Class` itself).
@@ -827,8 +831,6 @@
   // @param klass [Class]
   // @return [Class]
   Opal.build_class_singleton_class = function(klass) {
-    var superclass, meta;
-
     if (klass.$$meta) {
       return klass.$$meta;
     }
@@ -836,14 +838,13 @@
     // The singleton_class superclass is the singleton_class of its superclass;
     // but BasicObject has no superclass (its `$$super` is null), thus we
     // fallback on `Class`.
-    superclass = klass === BasicObject ? Class : Opal.get_singleton_class(klass.$$super);
+    var superclass = klass === BasicObject ? Class : Opal.get_singleton_class(klass.$$super);
 
-    meta = Opal.allocate_class(null, superclass, true);
+    var meta = $allocate_class(null, superclass, true);
 
     $prop(meta, '$$is_singleton', true);
     $prop(meta, '$$singleton_of', klass);
-    $prop(klass, '$$meta', meta);
-    $set_proto(klass, meta.$$prototype);
+    set_meta(klass, meta);
     // Restoring ClassName.class
     $prop(klass, '$$class', Opal.Class);
 
@@ -855,12 +856,11 @@
       return mod.$$meta;
     }
 
-    var meta = Opal.allocate_class(null, Opal.Module, true);
+    var meta = $allocate_class(null, Opal.Module, true);
 
     $prop(meta, '$$is_singleton', true);
     $prop(meta, '$$singleton_of', mod);
-    $prop(mod, '$$meta', meta);
-    $set_proto(mod, meta.$$prototype);
+    set_meta(mod, meta);
     // Restoring ModuleName.class
     $prop(mod, '$$class', Opal.Module);
 
@@ -873,16 +873,14 @@
   // @return [Class]
   Opal.build_object_singleton_class = function(object) {
     var superclass = object.$$class,
-        klass = Opal.allocate_class(nil, superclass, true);
+        klass = $allocate_class(nil, superclass, true);
 
     $prop(klass, '$$is_singleton', true);
     $prop(klass, '$$singleton_of', object);
 
     delete klass.$$prototype.$$class;
 
-    $prop(object, '$$meta', klass);
-
-    $set_proto(object, object.$$meta.$$prototype);
+    set_meta(object, klass);
 
     return klass;
   };
@@ -892,7 +890,7 @@
   };
 
   Opal.instance_methods = function(mod) {
-    var exclude = [], results = [], ancestors = Opal.ancestors(mod);
+    var exclude = [], results = [], ancestors = $ancestors(mod);
 
     for (var i = 0, l = ancestors.length; i < l; i++) {
       var ancestor = ancestors[i],
@@ -956,12 +954,7 @@
   };
 
   Opal.own_methods = function(obj) {
-    if (obj.$$meta) {
-      return Opal.own_instance_methods(obj.$$meta);
-    }
-    else {
-      return [];
-    }
+    return obj.$$meta ? Opal.own_instance_methods(obj.$$meta) : [];
   };
 
   Opal.receiver_methods = function(obj) {
@@ -978,7 +971,7 @@
   // @param module [Module]
   // @return [Object]
   Opal.class_variables = function(module) {
-    var ancestors = Opal.ancestors(module),
+    var ancestors = $ancestors(module),
         i, length = ancestors.length,
         result = {};
 
@@ -1000,7 +993,7 @@
   // @param name [String]
   // @param value [Object]
   Opal.class_variable_set = function(module, name, value) {
-    var ancestors = Opal.ancestors(module),
+    var ancestors = $ancestors(module),
         i, length = ancestors.length;
 
     for (i = length - 2; i >= 0; i--) {
@@ -1025,7 +1018,7 @@
     if ($has_own.call(module.$$cvars, name))
       return module.$$cvars[name];
 
-    var ancestors = Opal.ancestors(module),
+    var ancestors = $ancestors(module),
       i, length = ancestors.length;
 
     for (i = 0; i < length; i++) {
@@ -1105,7 +1098,7 @@
   // @param includer [Module] the target class to include module into
   // @return [null]
   Opal.append_features = function(module, includer) {
-    var module_ancestors = Opal.ancestors(module);
+    var module_ancestors = $ancestors(module);
     var iclasses = [];
 
     if (module_ancestors.indexOf(includer) !== -1) {
@@ -1117,7 +1110,7 @@
       $prop(iclass, '$$included', true);
       iclasses.push(iclass);
     }
-    var includer_ancestors = Opal.ancestors(includer),
+    var includer_ancestors = $ancestors(includer),
         chain = chain_iclasses(iclasses),
         start_chain_after,
         end_chain_on;
@@ -1210,7 +1203,7 @@
     // iclass(prepender)
     //      |
     //    parent
-    var module_ancestors = Opal.ancestors(module);
+    var module_ancestors = $ancestors(module);
     var iclasses = [];
 
     if (module_ancestors.indexOf(prepender) !== -1) {
@@ -1249,7 +1242,7 @@
       $set_proto(prepender_iclass, previous_parent);
     }
 
-    var prepender_ancestors = Opal.ancestors(prepender);
+    var prepender_ancestors = $ancestors(prepender);
 
     if (prepender_ancestors.indexOf(module) === -1) {
       // first time prepend
@@ -1409,7 +1402,7 @@
   }
 
   // The Array of ancestors for a given module/class
-  Opal.ancestors = function(module) {
+  function $ancestors(module) {
     if (!module) { return []; }
 
     if (module.$$ancestors_cache_version === Opal.const_cache_version) {
@@ -1423,7 +1416,7 @@
     }
 
     if (module.$$super) {
-      for (i = 0, mods = Opal.ancestors(module.$$super), length = mods.length; i < length; i++) {
+      for (i = 0, mods = $ancestors(module.$$super), length = mods.length; i < length; i++) {
         result.push(mods[i]);
       }
     }
@@ -1433,6 +1426,7 @@
 
     return result;
   };
+  Opal.ancestors = $ancestors;
 
   Opal.included_modules = function(module) {
     var result = [], mod = null, proto = Object.getPrototypeOf(module.$$prototype);
@@ -1514,7 +1508,7 @@
       this.$method_missing.$$p = method_missing_stub.$$p;
 
       // Set block property to null ready for the next call (stop false-positives)
-      delete method_missing_stub.$$p;
+      method_missing_stub.$$p = null;
 
       // call method missing with correct args (remove '$' prefix on method name)
       var args_ary = new Array(arguments.length);
@@ -1564,15 +1558,19 @@
     throw Opal.ArgumentError.$new(inspect + ': wrong number of arguments (given ' + actual + ', expected ' + expected + ')');
   };
 
+  function get_ancestors(obj) {
+    if (obj.hasOwnProperty('$$meta') && obj.$$meta !== null) {
+      return $ancestors(obj.$$meta);
+    } else {
+      return $ancestors(obj.$$class);
+    }
+  };
+
   // Super dispatcher
   Opal.find_super = function(obj, mid, current_func, defcheck, allow_stubs) {
     var jsid = '$' + mid, ancestors, super_method;
 
-    if (obj.hasOwnProperty('$$meta')) {
-      ancestors = Opal.ancestors(obj.$$meta);
-    } else {
-      ancestors = Opal.ancestors(obj.$$class);
-    }
+    ancestors = get_ancestors(obj);
 
     var current_index = ancestors.indexOf(current_func.$$owner);
 
@@ -1626,30 +1624,6 @@
   // @deprecated
   Opal.find_iter_super_dispatcher = Opal.find_block_super;
 
-  // Used to return as an expression. Sometimes, we can't simply return from
-  // a javascript function as if we were a method, as the return is used as
-  // an expression, or even inside a block which must "return" to the outer
-  // method. This helper simply throws an error which is then caught by the
-  // method. This approach is expensive, so it is only used when absolutely
-  // needed.
-  //
-  Opal.ret = function(val) {
-    Opal.returner.$v = val;
-    throw Opal.returner;
-  };
-
-  // Used to break out of a block.
-  Opal.brk = function(val, breaker) {
-    breaker.$v = val;
-    throw breaker;
-  };
-
-  // Builds a new unique breaker, this is to avoid multiple nested breaks to get
-  // in the way of each other.
-  Opal.new_brk = function() {
-    return new Error('unexpected break');
-  };
-
   // handles yield calls for 1 yielded arg
   Opal.yield1 = function(block, arg) {
     if (typeof(block) !== "function") {
@@ -1706,10 +1680,7 @@
           return result;
         }
       }
-      else if (candidate === Opal.JS.Error) {
-        return candidate;
-      }
-      else if (candidate['$==='](exception)) {
+      else if (candidate === Opal.JS.Error || candidate['$==='](exception)) {
         return candidate;
       }
     }
@@ -1726,7 +1697,7 @@
       return (klass.$$is_integer_class) ? (object % 1) === 0 : true;
     }
 
-    var ancestors = Opal.ancestors(object.$$is_class ? Opal.get_singleton_class(object) : (object.$$meta || object.$$class));
+    var ancestors = $ancestors(object.$$is_class ? Opal.get_singleton_class(object) : (object.$$meta || object.$$class));
 
     return ancestors.indexOf(klass) !== -1;
   };
@@ -1815,10 +1786,7 @@
     var kwargs = parameters[parameters.length - 1];
     if (kwargs != null && Opal.respond_to(kwargs, '$to_hash', true)) {
       $splice.call(parameters, parameters.length - 1);
-      return kwargs.$to_hash();
-    }
-    else {
-      return Opal.hash2([], {});
+      return kwargs;
     }
   };
 
@@ -1913,33 +1881,33 @@
   Opal.refined_send = function(refinement_groups, recv, method, args, block, blockopts) {
     var i, j, k, ancestors, ancestor, refinements, refinement, refine_modules, refine_module, body;
 
-    if (recv.hasOwnProperty('$$meta')) {
-      ancestors = Opal.ancestors(recv.$$meta);
-    } else {
-      ancestors = Opal.ancestors(recv.$$class);
-    }
+    ancestors = get_ancestors(recv);
 
     // For all ancestors that there are, starting from the closest to the furthest...
     for (i = 0; i < ancestors.length; i++) {
       ancestor = Opal.id(ancestors[i]);
+
       // For all refinement groups there are, starting from the closest scope to the furthest...
       for (j = 0; j < refinement_groups.length; j++) {
         refinements = refinement_groups[j];
+
         // For all refinements there are, starting from the last `using` call to the furthest...
         for (k = refinements.length - 1; k >= 0; k--) {
           refinement = refinements[k];
           if (typeof refinement.$$refine_modules === 'undefined') continue;
+
           // A single module being given as an argument of the `using` call contains multiple
           // refinement modules
           refine_modules = refinement.$$refine_modules;
+
           // Does this module refine a given call for a given ancestor module?
-          if (typeof refine_modules[ancestor] !== 'undefined') {
-            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];
-              return Opal.send2(recv, body, method, args, block, blockopts);
-            }
+          if (typeof refine_modules[ancestor] === 'undefined') continue;
+          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];
+            return Opal.send2(recv, body, method, args, block, blockopts);
           }
         }
       }
@@ -2012,6 +1980,8 @@
 
   // Define method on a module or class (see Opal.def).
   Opal.defn = function(module, jsid, body) {
+    $deny_frozen_access(module);
+
     body.displayName = jsid;
     body.$$owner = module;
 
@@ -2149,7 +2119,7 @@
         args[i] = arguments[i];
       }
 
-      delete alias.$$p;
+      alias.$$p = null;
 
       return Opal.send(this, body, args, block);
     };
@@ -2177,14 +2147,14 @@
   };
 
   Opal.alias_gvar = function(new_name, old_name) {
-    Object.defineProperty(Opal.gvars, new_name, {
+    Object.defineProperty($gvars, new_name, {
       configurable: true,
       enumerable: true,
       get: function() {
-        return Opal.gvars[old_name];
+        return $gvars[old_name];
       },
       set: function(new_value) {
-        Opal.gvars[old_name] = new_value;
+        $gvars[old_name] = new_value;
       }
     });
     return nil;
@@ -2430,35 +2400,37 @@
     hash = new Opal.Hash();
     Opal.hash_init(hash);
 
-    if (arguments_length === 1 && arguments[0].$$is_array) {
+    if (arguments_length === 1) {
       args = arguments[0];
-      length = args.length;
 
-      for (i = 0; i < length; i++) {
-        if (args[i].length !== 2) {
-          throw Opal.ArgumentError.$new("value not of length 2: " + args[i].$inspect());
-        }
-
-        key = args[i][0];
-        value = args[i][1];
-
-        Opal.hash_put(hash, key, value);
-      }
+      if (arguments[0].$$is_array) {
+        length = args.length;
 
-      return hash;
-    }
+        for (i = 0; i < length; i++) {
+          if (args[i].length !== 2) {
+            throw Opal.ArgumentError.$new("value not of length 2: " + args[i].$inspect());
+          }
 
-    if (arguments_length === 1) {
-      args = arguments[0];
-      for (key in args) {
-        if ($has_own.call(args, key)) {
-          value = args[key];
+          key = args[i][0];
+          value = args[i][1];
 
           Opal.hash_put(hash, key, value);
         }
+
+        return hash;
       }
+      else {
+        args = arguments[0];
+        for (key in args) {
+          if ($has_own.call(args, key)) {
+            value = args[key];
 
-      return hash;
+            Opal.hash_put(hash, key, value);
+          }
+        }
+
+        return hash;
+      }
     }
 
     if (arguments_length % 2 !== 0) {
@@ -2502,30 +2474,89 @@
     return range;
   };
 
+  var reserved_ivar_names = [
+    // properties
+    "constructor", "displayName", "__count__", "__noSuchMethod__",
+    "__parent__", "__proto__",
+    // methods
+    "hasOwnProperty", "valueOf"
+  ];
+
   // Get the ivar name for a given name.
   // Mostly adds a trailing $ to reserved names.
   //
   Opal.ivar = function(name) {
-    if (
-        // properties
-        name === "constructor" ||
-        name === "displayName" ||
-        name === "__count__" ||
-        name === "__noSuchMethod__" ||
-        name === "__parent__" ||
-        name === "__proto__" ||
-
-        // methods
-        name === "hasOwnProperty" ||
-        name === "valueOf"
-       )
-    {
-      return name + "$";
+    if (reserved_ivar_names.indexOf(name) !== -1) {
+      name += "$";
     }
 
     return name;
   };
 
+  // Support for #freeze
+  // -------------------
+
+  // 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}));
+    }
+  };
+  Opal.deny_frozen_access = $deny_frozen_access;
+
+  // common #freeze runtime support
+  Opal.freeze = function(obj) {
+    $prop(obj, "$$frozen", true);
+
+    // set $$id
+    if (!obj.hasOwnProperty('$$id')) { $prop(obj, '$$id', $uid()); }
+
+    if (obj.hasOwnProperty('$$meta')) {
+      // freeze $$meta if it has already been set
+      obj.$$meta.$freeze();
+    } else {
+      // ensure $$meta can be set lazily, $$meta is frozen when set in runtime.js
+      $prop(obj, '$$meta', null);
+    }
+
+    // $$comparable is used internally and set multiple times
+    // defining it before sealing ensures it can be modified later on
+    if (!obj.hasOwnProperty('$$comparable')) { $prop(obj, '$$comparable', null); }
+
+    // seal the Object
+    Object.seal(obj);
+
+    return obj;
+  };
+
+  // freze props, make setters of instance variables throw FrozenError
+  Opal.freeze_props = function(obj) {
+    var prop, prop_type, desc;
+
+    for(prop in obj) {
+      prop_type = typeof(prop);
+
+      // prop_type "object" here is a String(), skip $ props
+      if ((prop_type === "string" || prop_type === "object") && prop[0] === '$') {
+        continue;
+      }
+
+      desc = Object.getOwnPropertyDescriptor(obj, prop);
+      if (desc && desc.enumerable && desc.writable) {
+        // create closure to retain current value as cv
+        // for Opal 2.0 let for cv should do the trick, instead of a function
+        (function() {
+          // set v to undefined, as if the property is not set
+          var cv = obj[prop];
+          Object.defineProperty(obj, prop, {
+            get: function() { return cv; },
+            set: function(_val) { $deny_frozen_access(obj); },
+            enumerable: true
+          });
+        })();
+      }
+    }
+  };
 
   // Regexps
   // -------
@@ -2560,21 +2591,23 @@
   // on the object itself ($$gm or $$g attribute).
   //
   Opal.global_multiline_regexp = function(pattern) {
-    var result;
+    var result, flags;
+
+    // RegExp already has the global and multiline flag
+    if (pattern.global && pattern.multiline) return pattern;
+
+    flags = 'gm' + (pattern.ignoreCase ? 'i' : '');
     if (pattern.multiline) {
-      if (pattern.global) {
-        return pattern; // RegExp already has the global and multiline flag
-      }
       // we are using the $$g attribute because the Regexp is already multiline
-      if (pattern.$$g != null) {
-        result = pattern.$$g;
-      } else {
-        result = pattern.$$g = new RegExp(pattern.source, 'gm' + (pattern.ignoreCase ? 'i' : ''));
+      if (pattern.$$g == null) {
+        pattern.$$g = new RegExp(pattern.source, flags);
       }
-    } else if (pattern.$$gm != null) {
-      result = pattern.$$gm;
+      result = pattern.$$g;
     } else {
-      result = pattern.$$gm = new RegExp(pattern.source, 'gm' + (pattern.ignoreCase ? 'i' : ''));
+      if (pattern.$$gm == null) {
+        pattern.$$gm = new RegExp(pattern.source, flags);
+      }
+      result = pattern.$$gm;
     }
     result.lastIndex = null; // reset lastIndex property
     return result;
@@ -2650,9 +2683,7 @@
     }
   };
 
-  Opal.load = function(path) {
-    path = Opal.normalize(path);
-
+  Opal.load_normalized = function(path) {
     Opal.loaded([path]);
 
     var module = Opal.modules[path];
@@ -2684,6 +2715,12 @@
     return true;
   };
 
+  Opal.load = function(path) {
+    path = Opal.normalize(path);
+
+    return Opal.load_normalized(path);
+  };
+
   Opal.require = function(path) {
     path = Opal.normalize(path);
 
@@ -2691,7 +2728,7 @@
       return false;
     }
 
-    return Opal.load(path);
+    return Opal.load_normalized(path);
   };
 
 
@@ -2775,42 +2812,37 @@
 
   // Operator helpers
   // ----------------
-  Opal.rb_plus   = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l + r : l['$+'](r); }
-  Opal.rb_minus  = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l - r : l['$-'](r); }
-  Opal.rb_times  = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l * r : l['$*'](r); }
-  Opal.rb_divide = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l / r : l['$/'](r); }
-  Opal.rb_lt     = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l < r : l['$<'](r); }
-  Opal.rb_gt     = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l > r : l['$>'](r); }
-  Opal.rb_le     = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l <= r : l['$<='](r); }
-  Opal.rb_ge     = function(l,r) { return (typeof(l) === 'number' && typeof(r) === 'number') ? l >= r : l['$>='](r); }
+
+  function are_both_numbers(l,r) { return typeof(l) === 'number' && typeof(r) === 'number' }
+
+  Opal.rb_plus   = function(l,r) { return are_both_numbers(l,r) ? l + r : l['$+'](r); }
+  Opal.rb_minus  = function(l,r) { return are_both_numbers(l,r) ? l - r : l['$-'](r); }
+  Opal.rb_times  = function(l,r) { return are_both_numbers(l,r) ? l * r : l['$*'](r); }
+  Opal.rb_divide = function(l,r) { return are_both_numbers(l,r) ? l / r : l['$/'](r); }
+  Opal.rb_lt     = function(l,r) { return are_both_numbers(l,r) ? l < r : l['$<'](r); }
+  Opal.rb_gt     = function(l,r) { return are_both_numbers(l,r) ? l > r : l['$>'](r); }
+  Opal.rb_le     = function(l,r) { return are_both_numbers(l,r) ? l <= r : l['$<='](r); }
+  Opal.rb_ge     = function(l,r) { return are_both_numbers(l,r) ? l >= r : l['$>='](r); }
 
   // Optimized helpers for calls like $truthy((a)['$==='](b)) -> $eqeqeq(a, b)
+  function are_both_numbers_or_strings(lhs, rhs) {
+    return (typeof lhs === 'number' && typeof rhs === 'number') ||
+           (typeof lhs === 'string' && typeof rhs === 'string');
+  }
+
   function $eqeq(lhs, rhs) {
-    if ((typeof lhs === 'number' && typeof rhs === 'number') ||
-        (typeof lhs === 'string' && typeof rhs === 'string')) {
-      return lhs === rhs;
-    }
-    return $truthy((lhs)['$=='](rhs));
+    return are_both_numbers_or_strings(lhs,rhs) ? lhs === rhs : $truthy((lhs)['$=='](rhs));
   };
   Opal.eqeq = $eqeq;
-
   Opal.eqeqeq = function(lhs, rhs) {
-    if ((typeof lhs === 'number' && typeof rhs === 'number') ||
-        (typeof lhs === 'string' && typeof rhs === 'string')) {
-      return lhs === rhs;
-    }
-    return $truthy((lhs)['$==='](rhs));
+    return are_both_numbers_or_strings(lhs,rhs) ? lhs === rhs : $truthy((lhs)['$==='](rhs));
   };
   Opal.neqeq = function(lhs, rhs) {
-    if ((typeof lhs === 'number' && typeof rhs === 'number') ||
-        (typeof lhs === 'string' && typeof rhs === 'string')) {
-      return lhs !== rhs;
-    }
-    return $truthy((lhs)['$!='](rhs));
+    return are_both_numbers_or_strings(lhs,rhs) ? lhs !== rhs : $truthy((lhs)['$!='](rhs));
   };
   Opal.not = function(arg) {
-    if (true === arg) return false;
     if (undefined === arg || null === arg || false === arg || nil === arg) return true;
+    if (true === arg || arg['$!'].$$pristine) return false;
     return $truthy(arg['$!']());
   }
 
@@ -2827,29 +2859,49 @@
   }
   Opal.return_ivar = function(ivar) {
     return function() {
-      if (this[ivar] == null) this[ivar] = nil;
+      if (this[ivar] == null) { return nil; }
       return this[ivar];
     }
   }
   Opal.assign_ivar = function(ivar) {
     return function(val) {
+      $deny_frozen_access(this);
       return this[ivar] = val;
     }
   }
   Opal.assign_ivar_val = function(ivar, static_val) {
     return function() {
+      $deny_frozen_access(this);
       return this[ivar] = static_val;
     }
   }
 
+  // Primitives for handling parameters
+  Opal.ensure_kwargs = function(kwargs) {
+    if (kwargs == null) {
+      return Opal.hash2([], {});
+    } else if (kwargs.$$is_hash) {
+      return kwargs;
+    } else {
+      throw Opal.ArgumentError.$new('expected kwargs');
+    }
+  }
+
+  Opal.get_kwarg = function(kwargs, key) {
+    if (!$has_own.call(kwargs.$$smap, key)) {
+      throw Opal.ArgumentError.$new('missing keyword: '+key);
+    }
+    return kwargs.$$smap[key];
+  }
+
   // Initialization
   // --------------
-  Opal.BasicObject = BasicObject = Opal.allocate_class('BasicObject', null);
-  Opal.Object      = _Object     = Opal.allocate_class('Object', Opal.BasicObject);
-  Opal.Module      = Module      = Opal.allocate_class('Module', Opal.Object);
-  Opal.Class       = Class       = Opal.allocate_class('Class', Opal.Module);
-  Opal.Opal        = _Opal       = Opal.allocate_module('Opal');
-  Opal.Kernel      = Kernel      = Opal.allocate_module('Kernel');
+  Opal.BasicObject = BasicObject = $allocate_class('BasicObject', null);
+  Opal.Object      = _Object     = $allocate_class('Object', Opal.BasicObject);
+  Opal.Module      = Module      = $allocate_class('Module', Opal.Object);
+  Opal.Class       = Class       = $allocate_class('Class', Opal.Module);
+  Opal.Opal        = _Opal       = $allocate_module('Opal');
+  Opal.Kernel      = Kernel      = $allocate_module('Kernel');
 
   $set_proto(Opal.BasicObject, Opal.Class.$$prototype);
   $set_proto(Opal.Object, Opal.Class.$$prototype);
@@ -2857,7 +2909,7 @@
   $set_proto(Opal.Class, Opal.Class.$$prototype);
 
   // BasicObject can reach itself, avoid const_set to skip the $$base_module logic
-  BasicObject.$$const["BasicObject"] = BasicObject;
+  BasicObject.$$const.BasicObject = BasicObject;
 
   // Assign basic constants
   $const_set(_Object, "BasicObject",  BasicObject);
@@ -2899,19 +2951,36 @@
   function top_define_method() {
     var args = Opal.slice.call(arguments);
     var block = top_define_method.$$p;
-    delete top_define_method.$$p;
+    top_define_method.$$p = null;
     return Opal.send(_Object, 'define_method', args, block)
   };
 
   // Nil
-  Opal.NilClass = Opal.allocate_class('NilClass', Opal.Object);
+  Opal.NilClass = $allocate_class('NilClass', Opal.Object);
   $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.$$frozen = true;
+  nil.$$comparable = false;
+  Object.seal(nil);
+
+  Opal.thrower = function(type) {
+    var thrower = new Error('unexpected '+type);
+    thrower.$thrower_type = type;
+    thrower.$throw = function(value) {
+      if (value == null) value = nil;
+      thrower.$v = value;
+      throw thrower;
+    };
+    return thrower;
+  };
+
+  Opal.t_eval_return = Opal.thrower("return");
 
-  // Errors
-  Opal.breaker  = new Error('unexpected break (old)');
-  Opal.returner = new Error('unexpected return');
   TypeError.$$super = Error;
+
+  // If enable-file-source-embed compiler option is enabled, each module loaded will add its
+  // sources to this object
+  Opal.file_sources = {};
 }).call(this);