Changeset 72999 in webkit for trunk/JavaScriptCore/yarr/RegexParser.h

Timestamp:

Nov 30, 2010, 6:46:28 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Fixed review comments following bug #48101.
Mostly typos, plus gave quantifyInfinite a symbolic name.

Reviewed by Darin Adler.

• yarr/RegexCompiler.cpp:

(JSC::Yarr::RegexPatternConstructor::quantifyAtom):
(JSC::Yarr::RegexPatternConstructor::checkForTerminalParentheses):

• yarr/RegexInterpreter.cpp:

(JSC::Yarr::Interpreter::backtrackParenthesesOnceEnd):
(JSC::Yarr::Interpreter::matchParenthesesTerminalBegin):
(JSC::Yarr::Interpreter::backtrackParenthesesTerminalBegin):
(JSC::Yarr::Interpreter::backtrackParenthesesTerminalEnd):

• yarr/RegexJIT.cpp:

(JSC::Yarr::RegexGenerator::generatePatternCharacterGreedy):
(JSC::Yarr::RegexGenerator::generatePatternCharacterNonGreedy):
(JSC::Yarr::RegexGenerator::generateCharacterClassGreedy):

• yarr/RegexParser.h:

(JSC::Yarr::Parser::parseTokens):
(JSC::Yarr::parse):

LayoutTests: Ooops, file checked in with incorrect properties.

Reviewed by Darin Adler.

• fast/regex/script-tests/repeat-match-waldemar.js: Removed property svn:executable.

File:

• trunk/JavaScriptCore/yarr/RegexParser.h (modified) (5 diffs)

trunk/JavaScriptCore/yarr/RegexParser.h

@@ -33 +33 @@
 
 namespace JSC { namespace Yarr {
+
+static const unsigned quantifyInfinite = UINT_MAX;
 
 enum BuiltInCharacterClassID {
@@ -595 +597 @@
             case '*':
                 consume();
-                parseQuantifier(lastTokenWasAnAtom, 0, UINT_MAX);
+                parseQuantifier(lastTokenWasAnAtom, 0, quantifyInfinite);
                 lastTokenWasAnAtom = false;
                 break;
@@ -601 +603 @@
             case '+':
                 consume();
-                parseQuantifier(lastTokenWasAnAtom, 1, UINT_MAX);
+                parseQuantifier(lastTokenWasAnAtom, 1, quantifyInfinite);
                 lastTokenWasAnAtom = false;
                 break;
@@ -620 +622 @@
                     
                     if (tryConsume(','))
-                        max = peekIsDigit() ? consumeNumber() : UINT_MAX;
+                        max = peekIsDigit() ? consumeNumber() : quantifyInfinite;
 
                     if (tryConsume('}')) {
@@ -862 +864 @@
 
 template<class Delegate>
-const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = UINT_MAX)
+const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = quantifyInfinite)
 {
     return Parser<Delegate>(delegate, pattern, backReferenceLimit).parse();