Changeset 39130 in webkit for trunk/JavaScriptCore/wrec/WRECGenerator.cpp

Timestamp:

Dec 8, 2008, 11:24:05 PM (17 years ago)

Author:

[email protected]

Message:

2008-12-08 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Implemented more of the relaxed and somewhat weird rules for deciding
how to interpret a non-pattern-character.

• wrec/Escapes.h: (JSC::WREC::Escape::): (JSC::WREC::Escape::Escape): Eliminated Escape::None because it was unused. If you see an '
  ', it's either a valid escape or an error.

• wrec/Quantifier.h: (JSC::WREC::Quantifier::Quantifier):
• wrec/WRECGenerator.cpp: (JSC::WREC::Generator::generateNonGreedyQuantifier): (JSC::WREC::Generator::generateGreedyQuantifier): Renamed "noMaxSpecified" to "Infinity", since that's what it means.

• wrec/WRECParser.cpp: (JSC::WREC::Parser::consumeGreedyQuantifier): Re-wrote {n,m} parsing rules because they were too strict before. Added support for backtracking in the case where the {n,m} fails to parse as a quantifier, and yet is not a syntax error.

(JSC::WREC::Parser::parseCharacterClass):
(JSC::WREC::Parser::parseNonCharacterEscape): Eliminated Escape::None,
as above.

(JSC::WREC::Parser::consumeEscape): Don't treat ASCII and _ escapes
as syntax errors. See fast/regex/non-pattern-characters.html.

• wrec/WRECParser.h: (JSC::WREC::Parser::SavedState::SavedState): (JSC::WREC::Parser::SavedState::restore): Added a state backtracker, since parsing {n,m} forms requires backtracking if the form turns out not to be a quantifier.

File:

• trunk/JavaScriptCore/wrec/WRECGenerator.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wrec/WRECGenerator.cpp

@@ -181 +181 @@
     pop(index);
     // (3.2) if there is a limit, and we have reached it, game over. 
-    if (max != Quantifier::noMaxSpecified) {
+    if (max != Quantifier::Infinity) {
         je32(repeatCount, Imm32(max), quantifierFailed);
     }
@@ -231 +231 @@
     functor.generateAtom(this, doneReadingAtoms);
     add32(Imm32(1), repeatCount);
-    if (max == Quantifier::noMaxSpecified)
+    if (max == Quantifier::Infinity)
         jump(readAnAtom);
     else if (max == 1)