Revert of Revert of Hook up more import/exports in natives.

src/regexp.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 $regexpExec;
-var $regexpExecNoTests;
-var $regexpLastMatchInfo;
 var $regexpLastMatchInfoOverride;
 var harmony_regexps = false;
 var harmony_unicode_regexps = false;
 
 (function(global, utils) {
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var GlobalRegExp = global.RegExp;
 var InternalPackedArray = utils.InternalPackedArray;
 
 // -------------------------------------------------------------------
 
 // Property of the builtins object for recording the result of the last
-// regexp match.  The property $regexpLastMatchInfo includes the matchIndices
+// regexp match.  The property RegExpLastMatchInfo includes the matchIndices
 // array of the last successful regexp match (an array of start/end index
 // pairs for the match and all the captured substrings), the invariant is
 // that there are at least two capture indeces.  The array also contains
 // the subject string for the last successful match.
-$regexpLastMatchInfo = new InternalPackedArray(
+var RegExpLastMatchInfo = new InternalPackedArray(
  2,                 // REGEXP_NUMBER_OF_CAPTURES
  "",                // Last subject.
  UNDEFINED,         // Last input - settable with RegExpSetInput.
  0,                 // REGEXP_FIRST_CAPTURE + 0
  0                  // REGEXP_FIRST_CAPTURE + 1
 );
 
 // Override last match info with an array of actual substrings.
 // Used internally by replace regexp with function.
 // The array has the format of an "apply" argument for a replacement
@@ skipping 56 matching lines @@
   }
   if (IS_UNDEFINED(pattern) && %_ArgumentsLength() != 0) {
     DoConstructRegExp(this, 'undefined', flags);
   } else {
     DoConstructRegExp(this, pattern, flags);
   }
 }
 
 
 function DoRegExpExec(regexp, string, index) {
-  var result = %_RegExpExec(regexp, string, index, $regexpLastMatchInfo);
+  var result = %_RegExpExec(regexp, string, index, RegExpLastMatchInfo);
   if (result !== null) $regexpLastMatchInfoOverride = null;
   return result;
 }
 
 
 // This is kind of performance sensitive, so we want to avoid unnecessary
 // type checks on inputs. But we also don't want to inline it several times
 // manually, so we use a macro :-)
 macro RETURN_NEW_RESULT_FROM_MATCH_INFO(MATCHINFO, STRING)
   var numResults = NUMBER_OF_CAPTURES(MATCHINFO) >> 1;
@@ skipping 13 matching lines @@
       result[i] = %_SubString(STRING, start, end);
     }
     j++;
   }
   return result;
 endmacro
 
 
 function RegExpExecNoTests(regexp, string, start) {
   // Must be called with RegExp, string and positive integer as arguments.
-  var matchInfo = %_RegExpExec(regexp, string, start, $regexpLastMatchInfo);
+  var matchInfo = %_RegExpExec(regexp, string, start, RegExpLastMatchInfo);
   if (matchInfo !== null) {
     $regexpLastMatchInfoOverride = null;
     RETURN_NEW_RESULT_FROM_MATCH_INFO(matchInfo, string);
   }
   regexp.lastIndex = 0;
   return null;
 }
 
 
 function RegExpExecJS(string) {
@@ skipping 12 matching lines @@
   var updateLastIndex = this.global || (harmony_regexps && this.sticky);
   if (updateLastIndex) {
     if (i < 0 || i > string.length) {
       this.lastIndex = 0;
       return null;
     }
   } else {
     i = 0;
   }
 
-  // matchIndices is either null or the $regexpLastMatchInfo array.
-  var matchIndices = %_RegExpExec(this, string, i, $regexpLastMatchInfo);
+  // matchIndices is either null or the RegExpLastMatchInfo array.
+  var matchIndices = %_RegExpExec(this, string, i, RegExpLastMatchInfo);
 
   if (IS_NULL(matchIndices)) {
     this.lastIndex = 0;
     return null;
   }
 
   // Successful match.
   $regexpLastMatchInfoOverride = null;
   if (updateLastIndex) {
-    this.lastIndex = $regexpLastMatchInfo[CAPTURE1];
+    this.lastIndex = RegExpLastMatchInfo[CAPTURE1];
   }
   RETURN_NEW_RESULT_FROM_MATCH_INFO(matchIndices, string);
 }
 
 
 // One-element cache for the simplified test regexp.
 var regexp_key;
 var regexp_val;
 
 // Section 15.10.6.3 doesn't actually make sense, but the intention seems to be
@@ skipping 11 matching lines @@
 
   // Conversion is required by the ES5 specification (RegExp.prototype.exec
   // algorithm, step 5) even if the value is discarded for non-global RegExps.
   var i = TO_INTEGER(lastIndex);
 
   if (this.global || (harmony_regexps && this.sticky)) {
     if (i < 0 || i > string.length) {
       this.lastIndex = 0;
       return false;
     }
-    // matchIndices is either null or the $regexpLastMatchInfo array.
-    var matchIndices = %_RegExpExec(this, string, i, $regexpLastMatchInfo);
+    // matchIndices is either null or the RegExpLastMatchInfo array.
+    var matchIndices = %_RegExpExec(this, string, i, RegExpLastMatchInfo);
     if (IS_NULL(matchIndices)) {
       this.lastIndex = 0;
       return false;
     }
     $regexpLastMatchInfoOverride = null;
-    this.lastIndex = $regexpLastMatchInfo[CAPTURE1];
+    this.lastIndex = RegExpLastMatchInfo[CAPTURE1];
     return true;
   } else {
     // Non-global, non-sticky regexp.
     // Remove irrelevant preceeding '.*' in a test regexp.  The expression
     // checks whether this.source starts with '.*' and that the third char is
     // not a '?'.  But see https://code.google.com/p/v8/issues/detail?id=3560
     var regexp = this;
     if (regexp.source.length >= 3 &&
         %_StringCharCodeAt(regexp.source, 0) == 46 &&  // '.'
         %_StringCharCodeAt(regexp.source, 1) == 42 &&  // '*'
         %_StringCharCodeAt(regexp.source, 2) != 63) {  // '?'
       regexp = TrimRegExp(regexp);
     }
-    // matchIndices is either null or the $regexpLastMatchInfo array.
-    var matchIndices = %_RegExpExec(regexp, string, 0, $regexpLastMatchInfo);
+    // matchIndices is either null or the RegExpLastMatchInfo array.
+    var matchIndices = %_RegExpExec(regexp, string, 0, RegExpLastMatchInfo);
     if (IS_NULL(matchIndices)) {
       this.lastIndex = 0;
       return false;
     }
     $regexpLastMatchInfoOverride = null;
     return true;
   }
 }
 
 function TrimRegExp(regexp) {
@@ skipping 24 matching lines @@
 
 
 // Getters for the static properties lastMatch, lastParen, leftContext, and
 // rightContext of the RegExp constructor.  The properties are computed based
 // on the captures array of the last successful match and the subject string
 // of the last successful match.
 function RegExpGetLastMatch() {
   if ($regexpLastMatchInfoOverride !== null) {
     return OVERRIDE_MATCH($regexpLastMatchInfoOverride);
   }
-  var regExpSubject = LAST_SUBJECT($regexpLastMatchInfo);
+  var regExpSubject = LAST_SUBJECT(RegExpLastMatchInfo);
   return %_SubString(regExpSubject,
-                     $regexpLastMatchInfo[CAPTURE0],
-                     $regexpLastMatchInfo[CAPTURE1]);
+                     RegExpLastMatchInfo[CAPTURE0],
+                     RegExpLastMatchInfo[CAPTURE1]);
 }
 
 
 function RegExpGetLastParen() {
   if ($regexpLastMatchInfoOverride) {
     var override = $regexpLastMatchInfoOverride;
     if (override.length <= 3) return '';
     return override[override.length - 3];
   }
-  var length = NUMBER_OF_CAPTURES($regexpLastMatchInfo);
+  var length = NUMBER_OF_CAPTURES(RegExpLastMatchInfo);
   if (length <= 2) return '';  // There were no captures.
   // We match the SpiderMonkey behavior: return the substring defined by the
   // last pair (after the first pair) of elements of the capture array even if
   // it is empty.
-  var regExpSubject = LAST_SUBJECT($regexpLastMatchInfo);
-  var start = $regexpLastMatchInfo[CAPTURE(length - 2)];
-  var end = $regexpLastMatchInfo[CAPTURE(length - 1)];
+  var regExpSubject = LAST_SUBJECT(RegExpLastMatchInfo);
+  var start = RegExpLastMatchInfo[CAPTURE(length - 2)];
+  var end = RegExpLastMatchInfo[CAPTURE(length - 1)];
   if (start != -1 && end != -1) {
     return %_SubString(regExpSubject, start, end);
   }
   return "";
 }
 
 
 function RegExpGetLeftContext() {
   var start_index;
   var subject;
   if (!$regexpLastMatchInfoOverride) {
-    start_index = $regexpLastMatchInfo[CAPTURE0];
-    subject = LAST_SUBJECT($regexpLastMatchInfo);
+    start_index = RegExpLastMatchInfo[CAPTURE0];
+    subject = LAST_SUBJECT(RegExpLastMatchInfo);
   } else {
     var override = $regexpLastMatchInfoOverride;
     start_index = OVERRIDE_POS(override);
     subject = OVERRIDE_SUBJECT(override);
   }
   return %_SubString(subject, 0, start_index);
 }
 
 
 function RegExpGetRightContext() {
   var start_index;
   var subject;
   if (!$regexpLastMatchInfoOverride) {
-    start_index = $regexpLastMatchInfo[CAPTURE1];
-    subject = LAST_SUBJECT($regexpLastMatchInfo);
+    start_index = RegExpLastMatchInfo[CAPTURE1];
+    subject = LAST_SUBJECT(RegExpLastMatchInfo);
   } else {
     var override = $regexpLastMatchInfoOverride;
     subject = OVERRIDE_SUBJECT(override);
     var match = OVERRIDE_MATCH(override);
     start_index = OVERRIDE_POS(override) + match.length;
   }
   return %_SubString(subject, start_index, subject.length);
 }
 
 
 // The properties $1..$9 are the first nine capturing substrings of the last
 // successful match, or ''.  The function RegExpMakeCaptureGetter will be
 // called with indices from 1 to 9.
 function RegExpMakeCaptureGetter(n) {
   return function foo() {
     if ($regexpLastMatchInfoOverride) {
       if (n < $regexpLastMatchInfoOverride.length - 2) {
         return OVERRIDE_CAPTURE($regexpLastMatchInfoOverride, n);
       }
       return '';
     }
     var index = n * 2;
-    if (index >= NUMBER_OF_CAPTURES($regexpLastMatchInfo)) return '';
-    var matchStart = $regexpLastMatchInfo[CAPTURE(index)];
-    var matchEnd = $regexpLastMatchInfo[CAPTURE(index + 1)];
+    if (index >= NUMBER_OF_CAPTURES(RegExpLastMatchInfo)) return '';
+    var matchStart = RegExpLastMatchInfo[CAPTURE(index)];
+    var matchEnd = RegExpLastMatchInfo[CAPTURE(index + 1)];
     if (matchStart == -1 || matchEnd == -1) return '';
-    return %_SubString(LAST_SUBJECT($regexpLastMatchInfo), matchStart, matchEnd);
+    return %_SubString(LAST_SUBJECT(RegExpLastMatchInfo), matchStart, matchEnd);
   };
 }
 
 // -------------------------------------------------------------------
 
 %FunctionSetInstanceClassName(GlobalRegExp, 'RegExp');
 %AddNamedProperty(
     GlobalRegExp.prototype, 'constructor', GlobalRegExp, DONT_ENUM);
 %SetCode(GlobalRegExp, RegExpConstructor);
 
-$installFunctions(GlobalRegExp.prototype, DONT_ENUM, [
+utils.InstallFunctions(GlobalRegExp.prototype, DONT_ENUM, [
   "exec", RegExpExecJS,
   "test", RegExpTest,
   "toString", RegExpToString,
   "compile", RegExpCompileJS
 ]);
 
 // The length of compile is 1 in SpiderMonkey.
 %FunctionSetLength(GlobalRegExp.prototype.compile, 1);
 
 // The properties `input` and `$_` are aliases for each other.  When this
 // value is set the value it is set to is coerced to a string.
 // Getter and setter for the input.
 var RegExpGetInput = function() {
-  var regExpInput = LAST_INPUT($regexpLastMatchInfo);
+  var regExpInput = LAST_INPUT(RegExpLastMatchInfo);
   return IS_UNDEFINED(regExpInput) ? "" : regExpInput;
 };
 var RegExpSetInput = function(string) {
-  LAST_INPUT($regexpLastMatchInfo) = $toString(string);
+  LAST_INPUT(RegExpLastMatchInfo) = $toString(string);
 };
 
 %OptimizeObjectForAddingMultipleProperties(GlobalRegExp, 22);
 %DefineAccessorPropertyUnchecked(GlobalRegExp, 'input', RegExpGetInput,
                                  RegExpSetInput, DONT_DELETE);
 %DefineAccessorPropertyUnchecked(GlobalRegExp, '$_', RegExpGetInput,
                                  RegExpSetInput, DONT_ENUM | DONT_DELETE);
 
 // The properties multiline and $* are aliases for each other.  When this
 // value is set in SpiderMonkey, the value it is set to is coerced to a
@@ skipping 37 matching lines @@
 %DefineAccessorPropertyUnchecked(GlobalRegExp, "$'", RegExpGetRightContext,
                                  NoOpSetter, DONT_ENUM | DONT_DELETE);
 
 for (var i = 1; i < 10; ++i) {
   %DefineAccessorPropertyUnchecked(GlobalRegExp, '$' + i,
                                    RegExpMakeCaptureGetter(i), NoOpSetter,
                                    DONT_DELETE);
 }
 %ToFastProperties(GlobalRegExp);
 
-$regexpExecNoTests = RegExpExecNoTests;
-$regexpExec = DoRegExpExec;
+// -------------------------------------------------------------------
+// Exports
+
+utils.Export(function(to) {
+  to.RegExpExec = DoRegExpExec;
+  to.RegExpExecNoTests = RegExpExecNoTests;
+  to.RegExpLastMatchInfo = RegExpLastMatchInfo;
+});
 
 })