Reland "Wrap v8natives.js into a function."

src/messages.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.
 
 // -------------------------------------------------------------------
 
 var $errorToString;
 var $formatMessage;
 var $getStackTraceLine;
 var $messageGetPositionInLine;
@@ skipping 220 matching lines @@
             str = "#<error>";
         }
       }
     }
     result += str;
   }
   return result;
 }
 
 
+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 NoSideEffectToString(obj) {
   if (IS_STRING(obj)) return obj;
   if (IS_NUMBER(obj)) return %_NumberToString(obj);
   if (IS_BOOLEAN(obj)) return obj ? 'true' : 'false';
   if (IS_UNDEFINED(obj)) return 'undefined';
   if (IS_NULL(obj)) return 'null';
   if (IS_FUNCTION(obj)) {
-    var str = %_CallFunction(obj, FunctionToString);
+    var str = %_CallFunction(obj, obj, $functionSourceString);
     if (str.length > 128) {
       str = %_SubString(str, 0, 111) + "...<omitted>..." +
             %_SubString(str, str.length - 2, str.length);
     }
     return str;
   }
   if (IS_SYMBOL(obj)) return %_CallFunction(obj, $symbolToString);
   if (IS_OBJECT(obj)
-      && %GetDataProperty(obj, "toString") === ObjectToString) {
+      && %GetDataProperty(obj, "toString") === $objectToString) {
     var constructor = %GetDataProperty(obj, "constructor");
     if (typeof constructor == "function") {
       var constructorName = constructor.name;
       if (IS_STRING(constructorName) && constructorName !== "") {
         return "#<" + constructorName + ">";
       }
     }
   }
   if (CanBeSafelyTreatedAsAnErrorObject(obj)) {
     return %_CallFunction(obj, ErrorToString);
@@ skipping 31 matching lines @@
 function ToStringCheckErrorObject(obj) {
   if (CanBeSafelyTreatedAsAnErrorObject(obj)) {
     return %_CallFunction(obj, ErrorToString);
   } else {
     return ToString(obj);
   }
 }
 
 
 function ToDetailString(obj) {
-  if (obj != null && IS_OBJECT(obj) && obj.toString === ObjectToString) {
+  if (obj != null && IS_OBJECT(obj) && obj.toString === $objectToString) {
     var constructor = obj.constructor;
     if (typeof constructor == "function") {
       var constructorName = constructor.name;
       if (IS_STRING(constructorName) && constructorName !== "") {
         return "#<" + constructorName + ">";
       }
     }
   }
   return ToStringCheckErrorObject(obj);
 }
@@ skipping 257 matching lines @@
  *
  * @return {?string} script name if present, value for //# sourceURL or
  * deprecated //@ sourceURL comment otherwise.
  */
 function ScriptNameOrSourceURL() {
   if (this.source_url) return this.source_url;
   return this.name;
 }
 
 
-SetUpLockedPrototype(Script, [
+$setUpLockedPrototype(Script, [
     "source",
     "name",
     "source_url",
     "source_mapping_url",
     "line_ends",
     "line_offset",
     "column_offset"
   ], [
     "lineFromPosition", ScriptLineFromPosition,
     "locationFromPosition", ScriptLocationFromPosition,
@@ skipping 43 matching lines @@
  *     Source text for this location.
  */
 function SourceLocationSourceText() {
   return %_CallFunction(this.script.source,
                         this.start,
                         this.end,
                         $stringSubstring);
 }
 
 
-SetUpLockedPrototype(SourceLocation,
+$setUpLockedPrototype(SourceLocation,
   ["script", "position", "line", "column", "start", "end"],
   ["sourceText", SourceLocationSourceText]
 );
 
 
 /**
  * Class for a source slice. A source slice is a part of a script source with
  * the following properties:
  *   script        : script object for the source
  *   from_line     : line number for the first line in the slice
@@ skipping 23 matching lines @@
  * @return {String} Source text for this slice. The last line will include
  *     the line terminating characters (if any)
  */
 function SourceSliceSourceText() {
   return %_CallFunction(this.script.source,
                         this.from_position,
                         this.to_position,
                         $stringSubstring);
 }
 
-SetUpLockedPrototype(SourceSlice,
+$setUpLockedPrototype(SourceSlice,
   ["script", "from_line", "to_line", "from_position", "to_position"],
   ["sourceText", SourceSliceSourceText]
 );
 
 
 // Returns the offset of the given position within the containing
 // line.
 function GetPositionInLine(message) {
   var script = %MessageGetScript(message);
   var start_position = %MessageGetStartPosition(message);
@@ skipping 74 matching lines @@
   return %CallSiteGetFunctionNameRT(receiver, fun, pos);
 }
 
 function CallSiteGetMethodName() {
   // See if we can find a unique property on the receiver that holds
   // this function.
   var receiver = GET_PRIVATE(this, CallSiteReceiverKey);
   var fun = GET_PRIVATE(this, CallSiteFunctionKey);
   var ownName = fun.name;
   if (ownName && receiver &&
-      (%_CallFunction(receiver, ownName, ObjectLookupGetter) === fun ||
-       %_CallFunction(receiver, ownName, ObjectLookupSetter) === fun ||
+      (%_CallFunction(receiver, ownName, $objectLookupGetter) === fun ||
+       %_CallFunction(receiver, ownName, $objectLookupSetter) === fun ||
        (IS_OBJECT(receiver) && %GetDataProperty(receiver, ownName) === fun))) {
     // To handle DontEnum properties we guess that the method has
     // the same name as the function.
     return ownName;
   }
   var name = null;
   for (var prop in receiver) {
-    if (%_CallFunction(receiver, prop, ObjectLookupGetter) === fun ||
-        %_CallFunction(receiver, prop, ObjectLookupSetter) === fun ||
+    if (%_CallFunction(receiver, prop, $objectLookupGetter) === fun ||
+        %_CallFunction(receiver, prop, $objectLookupSetter) === fun ||
         (IS_OBJECT(receiver) && %GetDataProperty(receiver, prop) === fun)) {
       // If we find more than one match bail out to avoid confusion.
       if (name) {
         return null;
       }
       name = prop;
     }
   }
   if (name) {
     return name;
@@ skipping 96 matching lines @@
   } else {
     line += fileLocation;
     addSuffix = false;
   }
   if (addSuffix) {
     line += " (" + fileLocation + ")";
   }
   return line;
 }
 
-SetUpLockedPrototype(CallSite, ["receiver", "fun", "pos"], [
+$setUpLockedPrototype(CallSite, ["receiver", "fun", "pos"], [
   "getThis", CallSiteGetThis,
   "getTypeName", CallSiteGetTypeName,
   "isToplevel", CallSiteIsToplevel,
   "isEval", CallSiteIsEval,
   "getEvalOrigin", CallSiteGetEvalOrigin,
   "getScriptNameOrSourceURL", CallSiteGetScriptNameOrSourceURL,
   "getFunction", CallSiteGetFunction,
   "getFunctionName", CallSiteGetFunctionName,
   "getMethodName", CallSiteGetMethodName,
   "getFileName", CallSiteGetFileName,
@@ skipping 168 matching lines @@
     SET_PRIVATE(this, $stackTraceSymbol, UNDEFINED);
     SET_PRIVATE(this, formatted_stack_trace_symbol, v);
   }
 };
 
 
 // Use a dummy function since we do not actually want to capture a stack trace
 // when constructing the initial Error prototytpes.
 var captureStackTrace = function captureStackTrace(obj, cons_opt) {
   // Define accessors first, as this may fail and throw.
-  ObjectDefineProperty(obj, 'stack', { get: StackTraceGetter,
-                                       set: StackTraceSetter,
-                                       configurable: true });
+  $objectDefineProperty(obj, 'stack', { get: StackTraceGetter,
+                                        set: StackTraceSetter,
+                                        configurable: true });
   %CollectStackTrace(obj, cons_opt ? cons_opt : captureStackTrace);
 }
 
 
 // Define special error type constructors.
 function DefineError(f) {
   // Store the error function in both the global object
   // and the runtime object. The function is fetched
   // from the runtime object when throwing errors from
   // within the runtime system to avoid strange side
@@ skipping 103 matching lines @@
   } catch(e) {
     // If this error message was encountered already return the empty
     // string for it instead of recursively formatting it.
     if (e === cyclic_error_marker) {
       return '';
     }
     throw e;
   }
 }
 
-InstallFunctions(GlobalError.prototype, DONT_ENUM, ['toString', ErrorToString]);
+$installFunctions(GlobalError.prototype, DONT_ENUM,
+                  ['toString', ErrorToString]);
 
 $errorToString = ErrorToString;
 $formatMessage = FormatMessage;
 $getStackTraceLine = GetStackTraceLine;
 $messageGetPositionInLine = GetPositionInLine;
 $messageGetLineNumber = GetLineNumber;
 $messageGetSourceLine = GetSourceLine;
 $toDetailString = ToDetailString;
 
 $Error = GlobalError;
@@ skipping 46 matching lines @@
   return MakeGenericError(GlobalTypeError, type, [arg]);
 }
 
 //Boilerplate for exceptions for stack overflows. Used from
 //Isolate::StackOverflow().
 $stackOverflowBoilerplate = MakeRangeError(kStackOverflow);
 %DefineAccessorPropertyUnchecked($stackOverflowBoilerplate, 'stack',
                                  StackTraceGetter, StackTraceSetter, DONT_ENUM);
 
 })();