Reviewers: plesner, Message: Review, please.
Description: Issue 246 - wait until regexp is parsed to detect whether it's simple. Please review this at http://codereview.chromium.org/40103 Affected files: M src/parser.cc A test/mjsunit/regress/regress-246.js Index: src/parser.cc diff --git a/src/parser.cc b/src/parser.cc index 713c6a809e3dc34cf245254f8fc38397313345ad..115e1819f703168708f3c4b4af61fa9718fdcf85 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -3606,7 +3606,7 @@ RegExpParser::RegExpParser(FlatStringReader* in, next_pos_(0), in_(in), error_(error), - simple_(true), + simple_(false), contains_anchor_(false), captures_(NULL), is_scanned_for_captures_(false), @@ -3676,6 +3676,11 @@ RegExpTree* RegExpParser::ParsePattern() { if (has_more()) { ReportError(CStrVector("Unmatched ')'") CHECK_FAILED); } + // If the result of parsing is a literal string atom, and it has the + // same length as the input, then the atom is identical to the input. + if (result->IsAtom() && result->AsAtom()->length() == in()->length()) { + simple_ = true; + } return result; } @@ -3875,7 +3880,6 @@ RegExpTree* RegExpParser::ParseDisjunction() { Advance(2); break; } - simple_ = false; break; case '{': { int dummy; @@ -3932,7 +3936,6 @@ RegExpTree* RegExpParser::ParseDisjunction() { is_greedy = false; Advance(); } - simple_ = false; // Adding quantifier might *remove* look-ahead. builder.AddQuantifierToAtom(min, max, is_greedy); } } Index: test/mjsunit/regress/regress-246.js diff --git a/test/mjsunit/regress/regress-246.js b/test/mjsunit/regress/regress-246.js new file mode 100755 index 0000000000000000000000000000000000000000..4324b54041d3e3d266c12de100844db65b139502 --- /dev/null +++ b/test/mjsunit/regress/regress-246.js @@ -0,0 +1,31 @@ +// Copyright 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 +// 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=246 + +assertTrue(/(?:text)/.test("text")); +assertEquals(["text"], /(?:text)/.exec("text")); \ No newline at end of file --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
