Changeset 72999 in webkit for trunk/JavaScriptCore/yarr/RegexInterpreter.cpp

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/RegexInterpreter.cpp (modified) (4 diffs)

trunk/JavaScriptCore/yarr/RegexInterpreter.cpp

@@ -720 +720 @@
                     // Technically this access to inputPosition should be accessing the begin term's
                     // inputPosition, but for repeats other than fixed these values should be
-                    // the same anyway! (we don't pre-check for greedy or non-greedy matches.)
+                    // the same anyway! (We don't pre-check for greedy or non-greedy matches.)
                     ASSERT((&term - term.atom.parenthesesWidth)->type == ByteTerm::TypeParenthesesSubpatternOnceBegin);
                     ASSERT((&term - term.atom.parenthesesWidth)->inputPosition == term.inputPosition);
@@ -740 +740 @@
         ASSERT(term.type == ByteTerm::TypeParenthesesSubpatternTerminalBegin);
         ASSERT(term.atom.quantityType == QuantifierGreedy);
-        ASSERT(term.atom.quantityCount == UINT_MAX);
+        ASSERT(term.atom.quantityCount == quantifyInfinite);
         ASSERT(!term.capture());
 
@@ -766 +766 @@
         ASSERT(term.type == ByteTerm::TypeParenthesesSubpatternTerminalBegin);
         ASSERT(term.atom.quantityType == QuantifierGreedy);
-        ASSERT(term.atom.quantityCount == UINT_MAX);
+        ASSERT(term.atom.quantityCount == quantifyInfinite);
         ASSERT(!term.capture());
 
@@ -778 +778 @@
     {
         // 'Terminal' parentheses are at the end of the regex, and as such a match past end
-        // should always be returned as a successful match - we should never becktrack to here.
+        // should always be returned as a successful match - we should never backtrack to here.
         ASSERT_NOT_REACHED();
         return false;