Revert of Use shared container to manage imports/exports.

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;
@@ skipping 13 matching lines @@
 var MakeEvalError;
 var MakeRangeError;
 var MakeReferenceError;
 var MakeSyntaxError;
 var MakeTypeError;
 var MakeURIError;
 var MakeReferenceErrorEmbedded;
 var MakeSyntaxErrorEmbedded;
 var MakeTypeErrorEmbedded;
 
-(function(global, utils) {
+(function(global, shared, exports) {
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var GlobalObject = global.Object;
-var InternalArray = utils.InternalArray;
-
-var StringCharAt;
-var StringIndexOf;
-var StringSubstring;
-
-utils.Import(function(from) {
-  StringCharAt = from.StringCharAt;
-  StringIndexOf = from.StringIndexOf;
-  StringSubstring = from.StringSubstring;
-});
+var InternalArray = shared.InternalArray;
 
 // -------------------------------------------------------------------
 
 var GlobalError;
 var GlobalTypeError;
 var GlobalRangeError;
 var GlobalURIError;
 var GlobalSyntaxError;
 var GlobalReferenceError;
 var GlobalEvalError;
@@ skipping 185 matching lines @@
  */
 function ScriptLocationFromPosition(position,
                                     include_resource_offset) {
   var line = this.lineFromPosition(position);
   if (line == -1) return null;
 
   // Determine start, end and column.
   var line_ends = this.line_ends;
   var start = line == 0 ? 0 : line_ends[line - 1] + 1;
   var end = line_ends[line];
-  if (end > 0 && %_CallFunction(this.source, end - 1, StringCharAt) == '\r') {
+  if (end > 0 && %_CallFunction(this.source, end - 1, $stringCharAt) == '\r') {
     end--;
   }
   var column = position - start;
 
   // Adjust according to the offset within the resource.
   if (include_resource_offset) {
     line += this.line_offset;
     if (line == this.line_offset) {
       column += this.column_offset;
     }
@@ skipping 102 matching lines @@
 
   // Check parameter.
   if (line < 0 || this.lineCount() <= line) {
     return null;
   }
 
   // Return the source line.
   var line_ends = this.line_ends;
   var start = line == 0 ? 0 : line_ends[line - 1] + 1;
   var end = line_ends[line];
-  return %_CallFunction(this.source, start, end, StringSubstring);
+  return %_CallFunction(this.source, start, end, $stringSubstring);
 }
 
 
 /**
  * Returns the number of source lines.
  * @return {number}
  *     Number of source lines.
  */
 function ScriptLineCount() {
   // Return number of source lines.
@@ skipping 70 matching lines @@
 
 /**
  * Get the source text for a SourceLocation
  * @return {String}
  *     Source text for this location.
  */
 function SourceLocationSourceText() {
   return %_CallFunction(this.script.source,
                         this.start,
                         this.end,
-                        StringSubstring);
+                        $stringSubstring);
 }
 
 
 $setUpLockedPrototype(SourceLocation,
   ["script", "position", "line", "column", "start", "end"],
   ["sourceText", SourceLocationSourceText]
 );
 
 
 /**
@@ skipping 24 matching lines @@
 
 /**
  * Get the source text for a SourceSlice
  * @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);
+                        $stringSubstring);
 }
 
 $setUpLockedPrototype(SourceSlice,
   ["script", "from_line", "to_line", "from_position", "to_position"],
   ["sourceText", SourceSliceSourceText]
 );
 
 
 // Returns the offset of the given position within the containing
 // line.
@@ skipping 154 matching lines @@
   var line = "";
   var functionName = this.getFunctionName();
   var addSuffix = true;
   var isConstructor = this.isConstructor();
   var isMethodCall = !(this.isToplevel() || isConstructor);
   if (isMethodCall) {
     var typeName = GetTypeName(GET_PRIVATE(this, CallSiteReceiverKey), true);
     var methodName = this.getMethodName();
     if (functionName) {
       if (typeName &&
-          %_CallFunction(functionName, typeName, StringIndexOf) != 0) {
+          %_CallFunction(functionName, typeName, $stringIndexOf) != 0) {
         line += typeName + ".";
       }
       line += functionName;
       if (methodName &&
-          (%_CallFunction(functionName, "." + methodName, StringIndexOf) !=
+          (%_CallFunction(functionName, "." + methodName, $stringIndexOf) !=
            functionName.length - methodName.length - 1)) {
         line += " [as " + methodName + "]";
       }
     } else {
       line += typeName + "." + (methodName || "<anonymous>");
     }
   } else if (isConstructor) {
     line += "new " + (functionName || "<anonymous>");
   } else if (functionName) {
     line += functionName;
@@ skipping 369 matching lines @@
   return MakeGenericError(GlobalURIError, kURIMalformed);
 }
 
 //Boilerplate for exceptions for stack overflows. Used from
 //Isolate::StackOverflow().
 $stackOverflowBoilerplate = MakeRangeError(kStackOverflow);
 %DefineAccessorPropertyUnchecked($stackOverflowBoilerplate, 'stack',
                                  StackTraceGetter, StackTraceSetter, DONT_ENUM);
 
 })