Hook up more import/exports in natives.

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 $getStackTraceLine;
 var $messageGetPositionInLine;
 var $messageGetLineNumber;
 var $messageGetSourceLine;
 var $noSideEffectToString;
 var $stackOverflowBoilerplate;
 var $stackTraceSymbol;
 var $toDetailString;
 var $Error;
 var $EvalError;
 var $RangeError;
 var $ReferenceError;
 var $SyntaxError;
 var $TypeError;
 var $URIError;
 var MakeError;
 var MakeEvalError;
 var MakeRangeError;
 var MakeReferenceError;
 var MakeSyntaxError;
 var MakeTypeError;
 var MakeURIError;
-var MakeReferenceErrorEmbedded;
-var MakeSyntaxErrorEmbedded;
-var MakeTypeErrorEmbedded;
 
 (function(global, utils) {
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var GlobalObject = global.Object;
 var InternalArray = utils.InternalArray;
+var ObjectDefineProperty = utils.ObjectDefineProperty;
 
+var ArrayJoin;
+var ObjectToString;
 var StringCharAt;
 var StringIndexOf;
 var StringSubstring;
 
 utils.Import(function(from) {
+  ArrayJoin = from.ArrayJoin;
+  ObjectToString = from.ObjectToString;
   StringCharAt = from.StringCharAt;
   StringIndexOf = from.StringIndexOf;
   StringSubstring = from.StringSubstring;
 });
 
 // -------------------------------------------------------------------
 
 var GlobalError;
 var GlobalTypeError;
 var GlobalRangeError;
@@ skipping 19 matching lines @@
   if (IS_FUNCTION(obj)) {
     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 251 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, [
+utils.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,
+utils.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,
+utils.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 177 matching lines @@
   } else {
     line += fileLocation;
     addSuffix = false;
   }
   if (addSuffix) {
     line += " (" + fileLocation + ")";
   }
   return line;
 }
 
-$setUpLockedPrototype(CallSite, ["receiver", "fun", "pos"], [
+utils.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 106 matching lines @@
     } catch (e) {
       try {
         line = "<error: " + e + ">";
       } catch (ee) {
         // Any code that reaches this point is seriously nasty!
         line = "<error>";
       }
     }
     lines.push("    at " + line);
   }
-  return %_CallFunction(lines, "\n", $arrayJoin);
+  return %_CallFunction(lines, "\n", ArrayJoin);
 }
 
 
 function GetTypeName(receiver, requireConstructor) {
   var constructor = receiver.constructor;
   if (!constructor) {
     return requireConstructor ? null :
         %_CallFunction(receiver, NoSideEffectsObjectToString);
   }
   var constructorName = constructor.name;
@@ skipping 39 matching lines @@
 var StackTraceSetter = function(v) {
   if (HAS_PRIVATE(this, $stackTraceSymbol)) {
     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 });
-  %CollectStackTrace(obj, cons_opt ? cons_opt : captureStackTrace);
-}
+var captureStackTrace = function() {};
 
 
 // Define special error type constructors.
 function DefineError(global, 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
   // effects when overwriting the error functions from
   // user code.
@@ skipping 34 matching lines @@
 };
 
 GlobalError = DefineError(global, function Error() { });
 GlobalEvalError = DefineError(global, function EvalError() { });
 GlobalRangeError = DefineError(global, function RangeError() { });
 GlobalReferenceError = DefineError(global, function ReferenceError() { });
 GlobalSyntaxError = DefineError(global, function SyntaxError() { });
 GlobalTypeError = DefineError(global, function TypeError() { });
 GlobalURIError = DefineError(global, function URIError() { });
 
-
-GlobalError.captureStackTrace = captureStackTrace;
-
 %AddNamedProperty(GlobalError.prototype, 'message', '', DONT_ENUM);
 
 // Global list of error objects visited during ErrorToString. This is
 // used to detect cycles in error toString formatting.
 var visited_errors = new InternalArray();
 var cyclic_error_marker = new GlobalObject();
 
 function GetPropertyWithoutInvokingMonkeyGetters(error, name) {
   var current = error;
   // Climb the prototype chain until we find the holder.
@@ skipping 44 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]);
+utils.InstallFunctions(GlobalError.prototype, DONT_ENUM,
+                       ['toString', ErrorToString]);
 
 $errorToString = ErrorToString;
 $getStackTraceLine = GetStackTraceLine;
 $messageGetPositionInLine = GetPositionInLine;
 $messageGetLineNumber = GetLineNumber;
 $messageGetSourceLine = GetSourceLine;
 $noSideEffectToString = NoSideEffectToString;
 $toDetailString = ToDetailString;
 
 $Error = GlobalError;
@@ skipping 25 matching lines @@
 }
 
 MakeTypeError = function(type, arg0, arg1, arg2) {
   return MakeGenericError(GlobalTypeError, type, arg0, arg1, arg2);
 }
 
 MakeURIError = function() {
   return MakeGenericError(GlobalURIError, kURIMalformed);
 }
 
-//Boilerplate for exceptions for stack overflows. Used from
-//Isolate::StackOverflow().
+// Boilerplate for exceptions for stack overflows. Used from
+// Isolate::StackOverflow().
 $stackOverflowBoilerplate = MakeRangeError(kStackOverflow);
 %DefineAccessorPropertyUnchecked($stackOverflowBoilerplate, 'stack',
-                                 StackTraceGetter, StackTraceSetter, DONT_ENUM);
+                                 StackTraceGetter, StackTraceSetter,
+                                 DONT_ENUM);
 
-})
+// Define actual captureStackTrace function after everything has been set up.
+captureStackTrace = function captureStackTrace(obj, cons_opt) {
+  // Define accessors first, as this may fail and throw.
+  ObjectDefineProperty(obj, 'stack', { get: StackTraceGetter,
+                                       set: StackTraceSetter,
+                                       configurable: true });
+  %CollectStackTrace(obj, cons_opt ? cons_opt : captureStackTrace);
+};
+
+GlobalError.captureStackTrace = captureStackTrace;
+
+});