Reviewers: Erik Corry, Message: Small review, please
Description: Issue 254 - now correctly updates lastIndexof when using the test method. Please review this at http://codereview.chromium.org/40107 Affected files: M src/regexp-delay.js A test/mjsunit/regress/regress-254.js Index: src/regexp-delay.js diff --git a/src/regexp-delay.js b/src/regexp-delay.js index 0308e0200a59cca3caf741db932f1cc7ffff9fb4..098e557f4cd4cb0a19cea1b582efd3d35f08b2ce 100644 --- a/src/regexp-delay.js +++ b/src/regexp-delay.js @@ -225,6 +225,8 @@ function RegExpTest(string) { if (this.global) this.lastIndex = 0; return false; } + + if (this.global) this.lastIndex = lastMatchInfo[CAPTURE1]; return true; } Index: test/mjsunit/regress/regress-254.js diff --git a/test/mjsunit/regress/regress-254.js b/test/mjsunit/regress/regress-254.js new file mode 100755 index 0000000000000000000000000000000000000000..bc8ea1fa821f94b714442bc6439e14f955a6298f --- /dev/null +++ b/test/mjsunit/regress/regress-254.js @@ -0,0 +1,58 @@ +// 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=254 + +// RegExp with global flag: exec and test updates lastIndex. +var re = /x/g; + +assertEquals(0, re.lastIndex, "Global, initial lastIndex"); + +assertTrue(re.test("x"), "Global, test 1"); +assertEquals(1, re.lastIndex, "Global, lastIndex after test 1"); +assertFalse(re.test("x"), "Global, test 2"); +assertEquals(0, re.lastIndex, "Global, lastIndex after test 2"); + +assertEquals(["x"], re.exec("x"), "Global, exec 1"); +assertEquals(1, re.lastIndex, "Global, lastIndex after exec 1"); +assertEquals(null, re.exec("x"), "Global, exec 2"); +assertEquals(0, re.lastIndex, "Global, lastIndex after exec 2"); + +// RegExp without global flag: exec and test leavs lastIndex at zero. +var re2 = /x/; + +assertEquals(0, re2.lastIndex, "Non-global, initial lastIndex"); + +assertTrue(re2.test("x"), "Non-global, test 1"); +assertEquals(0, re2.lastIndex, "Non-global, lastIndex after test 1"); +assertTrue(re2.test("x"), "Non-global, test 2"); +assertEquals(0, re2.lastIndex, "Non-global, lastIndex after test 2"); + +assertEquals(["x"], re2.exec("x"), "Non-global, exec 1"); +assertEquals(0, re2.lastIndex, "Non-global, lastIndex after exec 1"); +assertEquals(["x"], re2.exec("x"), "Non-global, exec 2"); +assertEquals(0, re2.lastIndex, "Non-global, lastIndex after exec 2"); --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
