Periodic merge from bleeding_edge to experimental code generator...

src/string.js

 // Copyright 2006-2008 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 134 matching lines @@
   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);
   var subject = ToString(this);
 
   if (!regexp.global) return regexp.exec(subject);
+  %_Log('regexp', 'regexp-match,%0S,%1r', [subject, regexp]);
   var matches = DoRegExpExecGlobal(regexp, subject);
 
   // If the regexp did not match, return null.
   if (matches.length == 0) return null;
 
   // Build the result array.
   var result = new $Array(match_string);
   for (var i = 0; i < matches.length; ++i) {
     var match = matches[i];
     var match_string = subject.slice(match[0], match[1]);
@@ skipping 13 matching lines @@
   return %StringSlice(string, start, end);
 }
 
 
 // ECMA-262, section 15.5.4.11
 function StringReplace(search, replace) {
   var subject = ToString(this);
 
   // Delegate to one of the regular expression variants if necessary.
   if (IS_REGEXP(search)) {
+    %_Log('regexp', 'regexp-replace,%0r,%1S', [search, subject]);
     if (IS_FUNCTION(replace)) {
       return StringReplaceRegExpWithFunction(subject, search, replace);
     } else {
       return StringReplaceRegExp(subject, search, replace);
     }
   }
 
   // Convert the search argument to a string and search for it.
   search = ToString(search);
   var start = %StringIndexOf(subject, search, 0);
@@ skipping 308 matching lines @@
   // use that.  We do as SpiderMonkey and KJS.
   if (%_ArgumentsLength() === 0) {
     result[result.length] = subject;
     return result;
   }
 
   var length = subject.length;
   var currentIndex = 0;
   var startIndex = 0;
 
-  var sep = IS_REGEXP(separator) ? separator : ToString(separator);
+  var sep;
+  if (IS_REGEXP(separator)) {
+    sep = separator;
+    %_Log('regexp', 'regexp-split,%0S,%1r', [subject, sep]);
+  } else {
+    sep = ToString(separator);
+  }
 
   if (length === 0) {
     if (splitMatch(sep, subject, 0, 0) != null) return result;
     result[result.length] = subject;
     return result;
   }
 
   while (true) {
 
     if (startIndex === length) {
@@ skipping 322 matching lines @@
     "italics", StringItalics,
     "small", StringSmall,
     "strike", StringStrike,
     "sub", StringSub,
     "sup", StringSup
   ));
 }
 
 
 SetupString();