Reviewers: Mads Ager,
Description:
Bring bugfix of global regexps to the 2.1 branch.
global regexps now behave correctly after the second failed match on
the same string.
BUG=45469
Review URL: http://codereview.chromium.org/2843024
Please review this at http://codereview.chromium.org/2854025/show
Affected files:
M src/regexp.js
M src/version.cc
A test/mjsunit/regress/regress-45469.js
Index: src/regexp.js
diff --git a/src/regexp.js b/src/regexp.js
index
dc1b0429f7094c5c4fe80d5af5515c8fd2e5fb91..69cf136d108e1cd21bc30f445dc3919fe4879700
100644
--- a/src/regexp.js
+++ b/src/regexp.js
@@ -213,7 +213,10 @@ function RegExpExec(string) {
var matchIndices = %_RegExpExec(this, s, i, lastMatchInfo);
if (matchIndices == null) {
- if (this.global) this.lastIndex = 0;
+ if (this.global) {
+ this.lastIndex = 0;
+ if (lastIndex != 0) return matchIndices;
+ }
cache.lastIndex = lastIndex;
cache.regExp = this;
cache.subject = s;
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
c64f0a5a0864481ff2dabde5955b7c8e890527c5..55d0797a20d5633bf8907a542911e4b0156c347c
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 1
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 13
+#define PATCH_LEVEL 14
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
Index: test/mjsunit/regress/regress-45469.js
diff --git a/test/mjsunit/regress/regress-45469.js
b/test/mjsunit/regress/regress-45469.js
new file mode 100644
index
0000000000000000000000000000000000000000..832a73f063c11530f4b3f5b94762e909b746d66f
--- /dev/null
+++ b/test/mjsunit/regress/regress-45469.js
@@ -0,0 +1,46 @@
+// Copyright 2010 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.
+
+// Test that global regexps capture and fail in the correct cyclic way.
+
+var re = /x/g;
+
+for (var i = 0; i < 15; i++) {
+ assertEquals(i % 3, re.lastIndex, "preindex" + i);
+ var res = re.exec("xx");
+ assertEquals(i % 3 == 2 ? null : ["x"], res, "res" + i);
+}
+
+re = /x/g;
+
+for (var i = 0; i < 15; i++) {
+ assertEquals(i % 3, re.lastIndex, "testpreindex" + i);
+ var res = re.test("xx");
+ assertEquals(i % 3 != 2, res, "testres" + i);
+}
+
+
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
