Fix bug 225 in regexp replace with function.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1232 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/parser.cc b/src/parser.cc
index 60172d5..a8f7623 100644 (file)
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -3954,7 +3954,9 @@ bool RegExpParser::ParseIntervalQuantifier(int* min_out, int* max_out) {
     int next = current() - '0';
     if (min > (RegExpTree::kInfinity - next) / 10) {
       // Overflow. Skip past remaining decimal digits and return -1.
-      do { Advance(); } while (IsDecimalDigit(current()));
+      do {
+        Advance();
+      } while (IsDecimalDigit(current()));
       min = RegExpTree::kInfinity;
       break;
     }
@@ -3974,8 +3976,10 @@ bool RegExpParser::ParseIntervalQuantifier(int* min_out, int* max_out) {
       while (IsDecimalDigit(current())) {
         int next = current() - '0';
         if (max > (RegExpTree::kInfinity - next) / 10) {
-          do { Advance(); } while (IsDecimalDigit(current()));
-          max = RegExpTree::kInfinity;;
+          do {
+            Advance();
+          } while (IsDecimalDigit(current()));
+          max = RegExpTree::kInfinity;
           break;
         }
         max = 10 * max + next;

diff --git a/src/string.js b/src/string.js
index c90c0b4..14a6cb2 100644 (file)
--- a/src/string.js
+++ b/src/string.js
@@ -399,7 +399,13 @@ function StringReplaceRegExpWithFunction(subject, regexp, replace) {
       previous = captures[1];
       // Increment previous if we matched an empty string, as per ECMA-262
       // 15.5.4.10.
-      if (captures[0] == captures[1]) previous++;
+      if (previous == captures[0]) {
+        // Add the skipped character to the output, if any.
+        if (previous < subject.length) {
+          result.addSpecialSlice(previous, previous + 1);
+        }
+        previous++;
+      }
 
       // Per ECMA-262 15.10.6.2, if the previous index is greater than the
       // string length, there is no match

diff --git a/test/mjsunit/regress/regress-225.js b/test/mjsunit/regress/regress-225.js
new file mode 100644 (file)
index 0000000..e101ca0
--- /dev/null
+++ b/test/mjsunit/regress/regress-225.js
@@ -0,0 +1,32 @@
+// Copyright 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
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// See http://code.google.com/p/v8/issues/detail?id=225
+
+assertEquals("foo", "foo".replace(/(?:)/g, function() { return ""; }));
+
+assertEquals("foo", "foo".replace(/(?:)/g, ""));