Merge the partial_snapshots branch back into bleeding_edge. For...

src/string.js

 // Copyright 2006-2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 146 matching lines @@
   if (%_ArgumentsLength() === 0) return 0;
 
   var this_str = TO_STRING_INLINE(this);
   var other_str = TO_STRING_INLINE(other);
   return %StringLocaleCompare(this_str, other_str);
 }
 
 
 // ECMA-262 section 15.5.4.10
 function StringMatch(regexp) {
-  if (!IS_REGEXP(regexp)) regexp = new ORIGINAL_REGEXP(regexp);
+  if (!IS_REGEXP(regexp)) regexp = new $RegExp(regexp);
   var subject = TO_STRING_INLINE(this);
 
   if (!regexp.global) return regexp.exec(subject);
 
   var cache = regExpCache;
 
   if (%_ObjectEquals(cache.type, 'match') &&
       %_ObjectEquals(cache.regExp, regexp) &&
       %_ObjectEquals(cache.subject, subject)) {
     var last = cache.answer;
     if (last == null) {
       return last;
     } else {
       return CloneRegexpAnswer(last);
     }
   }
 
   %_Log('regexp', 'regexp-match,%0S,%1r', [subject, regexp]);
-  // lastMatchInfo is defined in regexp-delay.js.
+  // lastMatchInfo is defined in regexp.js.
   var result = %StringMatch(subject, regexp, lastMatchInfo);
   cache.type = 'match';
   cache.regExp = regexp;
   cache.subject = subject;
   cache.answer = result;
   if (result == null) {
     return result;
   } else {
     return CloneRegexpAnswer(result);
   }
@@ skipping 319 matching lines @@
     parameters[j] = CaptureString(subject, matchInfo, j);
   }
   parameters[j] = index;
   parameters[j + 1] = subject;
   return replace.apply(null, parameters);
 }
 
 
 // ECMA-262 section 15.5.4.12
 function StringSearch(re) {
-  var regexp = new ORIGINAL_REGEXP(re);
+  var regexp = new $RegExp(re);
   var s = TO_STRING_INLINE(this);
   var last_idx = regexp.lastIndex; // keep old lastIndex
   regexp.lastIndex = 0;            // ignore re.global property
   var result = regexp.exec(s);
   regexp.lastIndex = last_idx;     // restore lastIndex
   if (result == null)
     return -1;
   else
     return result.index;
 }
@@ skipping 352 matching lines @@
 }
 
 
 function StringSup() {
   return "<sup>" + this + "</sup>";
 }
 
 
 // ReplaceResultBuilder support.
 function ReplaceResultBuilder(str) {
+  this.__proto__ = void 0;
   this.elements = new $Array();
   this.special_string = str;
 }
 
 
 ReplaceResultBuilder.prototype.add = function(str) {
   str = TO_STRING_INLINE(str);
   if (str.length > 0) {
     var elements = this.elements;
     elements[elements.length] = str;
@@ skipping 76 matching lines @@
     "small", StringSmall,
     "strike", StringStrike,
     "sub", StringSub,
     "sup", StringSup,
     "toJSON", StringToJSON
   ));
 }
 
 
 SetupString();