Reland #2 "Wrap v8natives.js into a function."

src/v8natives.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file relies on the fact that the following declarations have been made
-// in runtime.js:
-// var $Object = global.Object;
-// var $Boolean = global.Boolean;
-// var $Number = global.Number;
-// var $Function = global.Function;
-// var $Array = global.Array;
+var $delete;
+var $functionSourceString;
+var $getIterator;
+var $getMethod;
+var $globalEval;
+var $installConstants;
+var $installFunctions;
+var $installGetter;
+var $isFinite;
+var $isNaN;
+var $newFunctionString;
+var $numberIsNaN;
+var $objectDefineProperties;
+var $objectDefineProperty;
+var $objectFreeze;
+var $objectGetOwnPropertyDescriptor;
+var $objectGetOwnPropertyKeys;
+var $objectHasOwnProperty;
+var $objectIsFrozen;
+var $objectIsSealed;
+var $objectLookupGetter;
+var $objectLookupSetter;
+var $objectToString;
+var $overrideFunction;
+var $setFunctionName;
+var $setUpLockedPrototype;
+var $toCompletePropertyDescriptor;
+var $toNameArray;
 
-var $isNaN = GlobalIsNaN;
-var $isFinite = GlobalIsFinite;
+(function() {
+
+%CheckIsBootstrapping();
+
+var GlobalArray = global.Array;
+var GlobalBoolean = global.Boolean;
+var GlobalFunction = global.Function;
+var GlobalNumber = global.Number;
+var GlobalObject = global.Object;
 
 // ----------------------------------------------------------------------------
 
 // ES6 - 9.2.11 SetFunctionName
 function SetFunctionName(f, name, prefix) {
   if (IS_SYMBOL(name)) {
     name = "[" + %SymbolDescription(name) + "]";
   }
   if (IS_UNDEFINED(prefix)) {
     %FunctionSetName(f, name);
@@ skipping 163 matching lines @@
   var f = %CompileString(x, false);
   if (!IS_FUNCTION(f)) return f;
 
   return %_CallFunction(global_proxy, f);
 }
 
 
 // ----------------------------------------------------------------------------
 
 // Set up global object.
-function SetUpGlobal() {
-  %CheckIsBootstrapping();
+var attributes = DONT_ENUM | DONT_DELETE | READ_ONLY;
 
-  var attributes = DONT_ENUM | DONT_DELETE | READ_ONLY;
+InstallConstants(global, [
+  // ECMA 262 - 15.1.1.1.
+  "NaN", NAN,
+  // ECMA-262 - 15.1.1.2.
+  "Infinity", INFINITY,
+  // ECMA-262 - 15.1.1.2.
+  "undefined", UNDEFINED,
+]);
 
-  // ECMA 262 - 15.1.1.1.
-  %AddNamedProperty(global, "NaN", NAN, attributes);
-
-  // ECMA-262 - 15.1.1.2.
-  %AddNamedProperty(global, "Infinity", INFINITY, attributes);
-
-  // ECMA-262 - 15.1.1.3.
-  %AddNamedProperty(global, "undefined", UNDEFINED, attributes);
-
-  // Set up non-enumerable function on the global object.
-  InstallFunctions(global, DONT_ENUM, [
-    "isNaN", GlobalIsNaN,
-    "isFinite", GlobalIsFinite,
-    "parseInt", GlobalParseInt,
-    "parseFloat", GlobalParseFloat,
-    "eval", GlobalEval
-  ]);
-}
-
-SetUpGlobal();
+// Set up non-enumerable function on the global object.
+InstallFunctions(global, DONT_ENUM, [
+  "isNaN", GlobalIsNaN,
+  "isFinite", GlobalIsFinite,
+  "parseInt", GlobalParseInt,
+  "parseFloat", GlobalParseFloat,
+  "eval", GlobalEval
+]);
 
 
 // ----------------------------------------------------------------------------
 // Object
 
 // ECMA-262 - 15.2.4.2
-function NoSideEffectsObjectToString() {
-  if (IS_UNDEFINED(this) && !IS_UNDETECTABLE(this)) return "[object Undefined]";
-  if (IS_NULL(this)) return "[object Null]";
-  return "[object " + %_ClassOf(TO_OBJECT_INLINE(this)) + "]";
-}
-
-
 function ObjectToString() {
   if (IS_UNDEFINED(this) && !IS_UNDETECTABLE(this)) return "[object Undefined]";
   if (IS_NULL(this)) return "[object Null]";
   var O = TO_OBJECT_INLINE(this);
   var builtinTag = %_ClassOf(O);
   var tag;
 
   // TODO(caitp): cannot wait to get rid of this flag :>
   if (harmony_tostring) {
-    var tag = O[symbolToStringTag];
+    tag = O[symbolToStringTag];
     if (!IS_STRING(tag)) {
       tag = builtinTag;
     }
   } else {
     tag = builtinTag;
   }
 
   return `[object ${tag}]`;
 }
 
@@ skipping 148 matching lines @@
   return { get: desc.getGet(),
            set: desc.getSet(),
            enumerable: desc.isEnumerable(),
            configurable: desc.isConfigurable() };
 }
 
 
 // Harmony Proxies
 function FromGenericPropertyDescriptor(desc) {
   if (IS_UNDEFINED(desc)) return desc;
-  var obj = new $Object();
+  var obj = new GlobalObject();
 
   if (desc.hasValue()) {
     %AddNamedProperty(obj, "value", desc.getValue(), NONE);
   }
   if (desc.hasWritable()) {
     %AddNamedProperty(obj, "writable", desc.isWritable(), NONE);
   }
   if (desc.hasGetter()) {
     %AddNamedProperty(obj, "get", desc.getGet(), NONE);
   }
@@ skipping 608 matching lines @@
   return FromPropertyDescriptor(desc);
 }
 
 
 // For Harmony proxies
 function ToNameArray(obj, trap, includeSymbols) {
   if (!IS_SPEC_OBJECT(obj)) {
     throw MakeTypeError(kProxyNonObjectPropNames, trap, obj);
   }
   var n = ToUint32(obj.length);
-  var array = new $Array(n);
+  var array = new GlobalArray(n);
   var realLength = 0;
   var names = { __proto__: null };  // TODO(rossberg): use sets once ready.
   for (var index = 0; index < n; index++) {
     var s = ToName(obj[index]);
     // TODO(rossberg): adjust once there is a story for symbols vs proxies.
     if (IS_SYMBOL(s) && !includeSymbols) continue;
     if (%HasOwnProperty(names, s)) {
       throw MakeTypeError(kProxyRepeatedPropName, trap, s);
     }
     array[index] = s;
@@ skipping 188 matching lines @@
   }
 
   if (%IsJSFunctionProxy(obj)) {
     var callTrap = %GetCallTrap(obj);
     var constructTrap = %GetConstructTrap(obj);
     var code = $proxyDelegateCallAndConstruct(callTrap, constructTrap);
     %Fix(obj);  // becomes a regular function
     %SetCode(obj, code);
     // TODO(rossberg): What about length and other properties? Not specified.
     // We just put in some half-reasonable defaults for now.
-    var prototype = new $Object();
-    $Object.defineProperty(prototype, "constructor",
+    var prototype = new GlobalObject();
+    ObjectDefineProperty(prototype, "constructor",
       {value: obj, writable: true, enumerable: false, configurable: true});
     // TODO(v8:1530): defineProperty does not handle prototype and length.
     %FunctionSetPrototype(obj, prototype);
     obj.length = 0;
   } else {
     %Fix(obj);
   }
   ObjectDefineProperties(obj, props);
 }
 
@@ skipping 144 matching lines @@
   } else {
     if (x == null) return { };
     return TO_OBJECT_INLINE(x);
   }
 }
 
 
 // ----------------------------------------------------------------------------
 // Object
 
-function SetUpObject() {
-  %CheckIsBootstrapping();
+%SetNativeFlag(GlobalObject);
+%SetCode(GlobalObject, ObjectConstructor);
 
-  %SetNativeFlag($Object);
-  %SetCode($Object, ObjectConstructor);
+%AddNamedProperty(GlobalObject.prototype, "constructor", GlobalObject,
+                  DONT_ENUM);
 
-  %AddNamedProperty($Object.prototype, "constructor", $Object, DONT_ENUM);
+// Set up non-enumerable functions on the Object.prototype object.
+InstallFunctions(GlobalObject.prototype, DONT_ENUM, [
+  "toString", ObjectToString,
+  "toLocaleString", ObjectToLocaleString,
+  "valueOf", ObjectValueOf,
+  "hasOwnProperty", ObjectHasOwnProperty,
+  "isPrototypeOf", ObjectIsPrototypeOf,
+  "propertyIsEnumerable", ObjectPropertyIsEnumerable,
+  "__defineGetter__", ObjectDefineGetter,
+  "__lookupGetter__", ObjectLookupGetter,
+  "__defineSetter__", ObjectDefineSetter,
+  "__lookupSetter__", ObjectLookupSetter
+]);
+InstallGetterSetter(GlobalObject.prototype, "__proto__", ObjectGetProto,
+                    ObjectSetProto);
 
-  // Set up non-enumerable functions on the Object.prototype object.
-  InstallFunctions($Object.prototype, DONT_ENUM, [
-    "toString", ObjectToString,
-    "toLocaleString", ObjectToLocaleString,
-    "valueOf", ObjectValueOf,
-    "hasOwnProperty", ObjectHasOwnProperty,
-    "isPrototypeOf", ObjectIsPrototypeOf,
-    "propertyIsEnumerable", ObjectPropertyIsEnumerable,
-    "__defineGetter__", ObjectDefineGetter,
-    "__lookupGetter__", ObjectLookupGetter,
-    "__defineSetter__", ObjectDefineSetter,
-    "__lookupSetter__", ObjectLookupSetter
-  ]);
-  InstallGetterSetter($Object.prototype, "__proto__",
-                      ObjectGetProto, ObjectSetProto);
-
-  // Set up non-enumerable functions in the Object object.
-  InstallFunctions($Object, DONT_ENUM, [
-    "keys", ObjectKeys,
-    "create", ObjectCreate,
-    "defineProperty", ObjectDefineProperty,
-    "defineProperties", ObjectDefineProperties,
-    "freeze", ObjectFreezeJS,
-    "getPrototypeOf", ObjectGetPrototypeOf,
-    "setPrototypeOf", ObjectSetPrototypeOf,
-    "getOwnPropertyDescriptor", ObjectGetOwnPropertyDescriptor,
-    "getOwnPropertyNames", ObjectGetOwnPropertyNames,
-    // getOwnPropertySymbols is added in symbol.js.
-    "is", ObjectIs,
-    "isExtensible", ObjectIsExtensible,
-    "isFrozen", ObjectIsFrozen,
-    "isSealed", ObjectIsSealed,
-    "preventExtensions", ObjectPreventExtension,
-    "seal", ObjectSealJS
-    // deliverChangeRecords, getNotifier, observe and unobserve are added
-    // in object-observe.js.
-  ]);
-}
-
-SetUpObject();
+// Set up non-enumerable functions in the Object object.
+InstallFunctions(GlobalObject, DONT_ENUM, [
+  "keys", ObjectKeys,
+  "create", ObjectCreate,
+  "defineProperty", ObjectDefineProperty,
+  "defineProperties", ObjectDefineProperties,
+  "freeze", ObjectFreezeJS,
+  "getPrototypeOf", ObjectGetPrototypeOf,
+  "setPrototypeOf", ObjectSetPrototypeOf,
+  "getOwnPropertyDescriptor", ObjectGetOwnPropertyDescriptor,
+  "getOwnPropertyNames", ObjectGetOwnPropertyNames,
+  // getOwnPropertySymbols is added in symbol.js.
+  "is", ObjectIs,
+  "isExtensible", ObjectIsExtensible,
+  "isFrozen", ObjectIsFrozen,
+  "isSealed", ObjectIsSealed,
+  "preventExtensions", ObjectPreventExtension,
+  "seal", ObjectSealJS
+  // deliverChangeRecords, getNotifier, observe and unobserve are added
+  // in object-observe.js.
+]);
 
 
 // ----------------------------------------------------------------------------
 // Boolean
 
 function BooleanConstructor(x) {
   if (%_IsConstructCall()) {
     %_SetValueOf(this, ToBoolean(x));
   } else {
     return ToBoolean(x);
@@ skipping 20 matching lines @@
   // 'this'. This is not as dictated by ECMA-262.
   if (!IS_BOOLEAN(this) && !IS_BOOLEAN_WRAPPER(this)) {
     throw MakeTypeError(kNotGeneric, 'Boolean.prototype.valueOf');
   }
   return %_ValueOf(this);
 }
 
 
 // ----------------------------------------------------------------------------
 
-function SetUpBoolean () {
-  %CheckIsBootstrapping();
+%SetCode(GlobalBoolean, BooleanConstructor);
+%FunctionSetPrototype(GlobalBoolean, new GlobalBoolean(false));
+%AddNamedProperty(GlobalBoolean.prototype, "constructor", GlobalBoolean,
+                  DONT_ENUM);
 
-  %SetCode($Boolean, BooleanConstructor);
-  %FunctionSetPrototype($Boolean, new $Boolean(false));
-  %AddNamedProperty($Boolean.prototype, "constructor", $Boolean, DONT_ENUM);
-
-  InstallFunctions($Boolean.prototype, DONT_ENUM, [
-    "toString", BooleanToString,
-    "valueOf", BooleanValueOf
-  ]);
-}
-
-SetUpBoolean();
+InstallFunctions(GlobalBoolean.prototype, DONT_ENUM, [
+  "toString", BooleanToString,
+  "valueOf", BooleanValueOf
+]);
 
 
 // ----------------------------------------------------------------------------
 // Number
 
 function NumberConstructor(x) {
   var value = %_ArgumentsLength() == 0 ? 0 : ToNumber(x);
   if (%_IsConstructCall()) {
     %_SetValueOf(this, value);
   } else {
@@ skipping 135 matching lines @@
 // Harmony isNaN.
 function NumberIsNaN(number) {
   return IS_NUMBER(number) && NUMBER_IS_NAN(number);
 }
 
 
 // Harmony isSafeInteger
 function NumberIsSafeInteger(number) {
   if (NumberIsFinite(number)) {
     var integral = TO_INTEGER(number);
-    if (integral == number) return $abs(integral) <= $Number.MAX_SAFE_INTEGER;
+    if (integral == number) {
+      return $abs(integral) <= GlobalNumber.MAX_SAFE_INTEGER;
+    }
   }
   return false;
 }
 
 
 // ----------------------------------------------------------------------------
 
-function SetUpNumber() {
-  %CheckIsBootstrapping();
+%SetCode(GlobalNumber, NumberConstructor);
+%FunctionSetPrototype(GlobalNumber, new GlobalNumber(0));
 
-  %SetCode($Number, NumberConstructor);
-  %FunctionSetPrototype($Number, new $Number(0));
+%OptimizeObjectForAddingMultipleProperties(GlobalNumber.prototype, 8);
+// Set up the constructor property on the Number prototype object.
+%AddNamedProperty(GlobalNumber.prototype, "constructor", GlobalNumber,
+                  DONT_ENUM);
 
-  %OptimizeObjectForAddingMultipleProperties($Number.prototype, 8);
-  // Set up the constructor property on the Number prototype object.
-  %AddNamedProperty($Number.prototype, "constructor", $Number, DONT_ENUM);
+InstallConstants(GlobalNumber, [
+  // ECMA-262 section 15.7.3.1.
+  "MAX_VALUE", 1.7976931348623157e+308,
+  // ECMA-262 section 15.7.3.2.
+  "MIN_VALUE", 5e-324,
+  // ECMA-262 section 15.7.3.3.
+  "NaN", NAN,
+  // ECMA-262 section 15.7.3.4.
+  "NEGATIVE_INFINITY", -INFINITY,
+  // ECMA-262 section 15.7.3.5.
+  "POSITIVE_INFINITY", INFINITY,
 
-  InstallConstants($Number, [
-    // ECMA-262 section 15.7.3.1.
-    "MAX_VALUE", 1.7976931348623157e+308,
-    // ECMA-262 section 15.7.3.2.
-    "MIN_VALUE", 5e-324,
-    // ECMA-262 section 15.7.3.3.
-    "NaN", NAN,
-    // ECMA-262 section 15.7.3.4.
-    "NEGATIVE_INFINITY", -INFINITY,
-    // ECMA-262 section 15.7.3.5.
-    "POSITIVE_INFINITY", INFINITY,
+  // --- Harmony constants (no spec refs until settled.)
 
-    // --- Harmony constants (no spec refs until settled.)
+  "MAX_SAFE_INTEGER", %_MathPow(2, 53) - 1,
+  "MIN_SAFE_INTEGER", -%_MathPow(2, 53) + 1,
+  "EPSILON", %_MathPow(2, -52)
+]);
 
-    "MAX_SAFE_INTEGER", %_MathPow(2, 53) - 1,
-    "MIN_SAFE_INTEGER", -%_MathPow(2, 53) + 1,
-    "EPSILON", %_MathPow(2, -52)
-  ]);
+// Set up non-enumerable functions on the Number prototype object.
+InstallFunctions(GlobalNumber.prototype, DONT_ENUM, [
+  "toString", NumberToStringJS,
+  "toLocaleString", NumberToLocaleString,
+  "valueOf", NumberValueOf,
+  "toFixed", NumberToFixedJS,
+  "toExponential", NumberToExponentialJS,
+  "toPrecision", NumberToPrecisionJS
+]);
 
-  // Set up non-enumerable functions on the Number prototype object.
-  InstallFunctions($Number.prototype, DONT_ENUM, [
-    "toString", NumberToStringJS,
-    "toLocaleString", NumberToLocaleString,
-    "valueOf", NumberValueOf,
-    "toFixed", NumberToFixedJS,
-    "toExponential", NumberToExponentialJS,
-    "toPrecision", NumberToPrecisionJS
-  ]);
+// Harmony Number constructor additions
+InstallFunctions(GlobalNumber, DONT_ENUM, [
+  "isFinite", NumberIsFinite,
+  "isInteger", NumberIsInteger,
+  "isNaN", NumberIsNaN,
+  "isSafeInteger", NumberIsSafeInteger,
+  "parseInt", GlobalParseInt,
+  "parseFloat", GlobalParseFloat
+]);
 
-  // Harmony Number constructor additions
-  InstallFunctions($Number, DONT_ENUM, [
-    "isFinite", NumberIsFinite,
-    "isInteger", NumberIsInteger,
-    "isNaN", NumberIsNaN,
-    "isSafeInteger", NumberIsSafeInteger,
-    "parseInt", GlobalParseInt,
-    "parseFloat", GlobalParseFloat
-  ]);
-
-  %SetInlineBuiltinFlag(NumberIsNaN);
-}
-
-SetUpNumber();
+%SetInlineBuiltinFlag(NumberIsNaN);
 
 
 // ----------------------------------------------------------------------------
 // Function
 
 function NativeCodeFunctionSourceString(func) {
   var name = %FunctionGetName(func);
   if (name) {
     // Mimic what KJS does.
     return 'function ' + name + '() { [native code] }';
@@ skipping 97 matching lines @@
   // which are non-configurable. It therefore makes no sence to
   // try to redefine these as defined by the spec. The spec says
   // that bind should make these throw a TypeError if get or set
   // is called and make them non-enumerable and non-configurable.
   // To be consistent with our normal functions we leave this as it is.
   // TODO(lrn): Do set these to be thrower.
   return result;
 }
 
 
-function NewFunctionString(arguments, function_token) {
-  var n = arguments.length;
+function NewFunctionString(args, function_token) {
+  var n = args.length;
   var p = '';
   if (n > 1) {
-    p = ToString(arguments[0]);
+    p = ToString(args[0]);
     for (var i = 1; i < n - 1; i++) {
-      p += ',' + ToString(arguments[i]);
+      p += ',' + ToString(args[i]);
     }
     // If the formal parameters string include ) - an illegal
     // character - it may make the combined function expression
     // compile. We avoid this problem by checking for this early on.
     if (%_CallFunction(p, ')', $stringIndexOf) != -1) {
       throw MakeSyntaxError(kParenthesisInArgString);
     }
     // If the formal parameters include an unbalanced block comment, the
     // function must be rejected. Since JavaScript does not allow nested
     // comments we can include a trailing block comment to catch this.
     p += '\n/' + '**/';
   }
-  var body = (n > 0) ? ToString(arguments[n - 1]) : '';
+  var body = (n > 0) ? ToString(args[n - 1]) : '';
   return '(' + function_token + '(' + p + ') {\n' + body + '\n})';
 }
 
 
 function FunctionConstructor(arg1) {  // length == 1
   var source = NewFunctionString(arguments, 'function');
   var global_proxy = %GlobalProxy(global);
   // Compile the string in the constructor and not a helper so that errors
   // appear to come from here.
   var f = %_CallFunction(global_proxy, %CompileString(source, true));
   %FunctionMarkNameShouldPrintAsAnonymous(f);
   return f;
 }
 
 
 // ----------------------------------------------------------------------------
 
-function SetUpFunction() {
-  %CheckIsBootstrapping();
+%SetCode(GlobalFunction, FunctionConstructor);
+%AddNamedProperty(GlobalFunction.prototype, "constructor", GlobalFunction,
+                  DONT_ENUM);
 
-  %SetCode($Function, FunctionConstructor);
-  %AddNamedProperty($Function.prototype, "constructor", $Function, DONT_ENUM);
-
-  InstallFunctions($Function.prototype, DONT_ENUM, [
-    "bind", FunctionBind,
-    "toString", FunctionToString
-  ]);
-}
-
-SetUpFunction();
-
+InstallFunctions(GlobalFunction.prototype, DONT_ENUM, [
+  "bind", FunctionBind,
+  "toString", FunctionToString
+]);
 
 // ----------------------------------------------------------------------------
 // Iterator related spec functions.
 
 // ES6 rev 33, 2015-02-12
 // 7.4.1 GetIterator ( obj, method )
 function GetIterator(obj, method) {
   if (IS_UNDEFINED(method)) {
     method = obj[symbolIterator];
   }
   if (!IS_SPEC_FUNCTION(method)) {
     throw MakeTypeError(kNotIterable, obj);
   }
   var iterator = %_CallFunction(obj, method);
   if (!IS_SPEC_OBJECT(iterator)) {
     throw MakeTypeError(kNotAnIterator, iterator);
   }
   return iterator;
 }
+
+//----------------------------------------------------------------------------
+
+$delete = Delete;
+$functionSourceString = FunctionSourceString;
+$getIterator = GetIterator;
+$getMethod = GetMethod;
+$globalEval = GlobalEval;
+$installConstants = InstallConstants;
+$installFunctions = InstallFunctions;
+$installGetter = InstallGetter;
+$isFinite = GlobalIsFinite;
+$isNaN = GlobalIsNaN;
+$newFunctionString = NewFunctionString;
+$numberIsNaN = NumberIsNaN;
+$objectDefineProperties = ObjectDefineProperties;
+$objectDefineProperty = ObjectDefineProperty;
+$objectFreeze = ObjectFreezeJS;
+$objectGetOwnPropertyDescriptor = ObjectGetOwnPropertyDescriptor;
+$objectGetOwnPropertyKeys = ObjectGetOwnPropertyKeys;
+$objectHasOwnProperty = ObjectHasOwnProperty;
+$objectIsFrozen = ObjectIsFrozen;
+$objectIsSealed = ObjectIsSealed;
+$objectLookupGetter = ObjectLookupGetter;
+$objectLookupSetter = ObjectLookupSetter;
+$objectToString = ObjectToString;
+$overrideFunction = OverrideFunction;
+$setFunctionName = SetFunctionName;
+$setUpLockedPrototype = SetUpLockedPrototype;
+$toCompletePropertyDescriptor = ToCompletePropertyDescriptor;
+$toNameArray = ToNameArray;
+
+})();