Changeset 37194 in webkit for trunk/JavaScriptCore/wrec/WREC.cpp

Timestamp:

Oct 2, 2008, 9:45:24 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-02 Gavin Barraclough <​[email protected]>

Reviewed by Darin Adler.

Fix for bug #21232 - should reset m_isPendingDash on flush,
and should allow '\-' as beginning or end of a range (though
not to specifiy a range itself).

• ChangeLog:
• wrec/CharacterClassConstructor.cpp: (JSC::CharacterClassConstructor::put): (JSC::CharacterClassConstructor::flush):
• wrec/CharacterClassConstructor.h: (JSC::CharacterClassConstructor::flushBeforeEscapedHyphen):
• wrec/WREC.cpp: (JSC::WRECGenerator::generateDisjunction): (JSC::WRECParser::parseCharacterClass): (JSC::WRECParser::parseDisjunction):
• wrec/WREC.h:

LayoutTests:

2008-10-02 Gavin Barraclough <​[email protected]>

Reviewed by Darin Adler.

Layout tests for for bug #21232 - plus a range of tests for, um, ranges.

• fast/js/regexp-ranges-and-escaped-hyphens-expected.txt: Added.
• fast/js/regexp-ranges-and-escaped-hyphens.html: Added.
• fast/js/resources/regexp-ranges-and-escaped-hyphens.js: Added.

File:

• trunk/JavaScriptCore/wrec/WREC.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wrec/WREC.cpp

@@ -744 +744 @@
 }
 
-void WRECGenerator::gernerateDisjunction(JmpSrcVector& successes, JmpSrcVector& failures)
+void WRECGenerator::generateDisjunction(JmpSrcVector& successes, JmpSrcVector& failures)
 {
     successes.append(m_jit.emitUnlinkedJmp());
@@ -1067 +1067 @@
             case '-':
                 consume();
+                charClassConstructor.flushBeforeEscapedHyphen();
                 charClassConstructor.put(ch);
-                charClassConstructor.flush();
                 break;
 
@@ -1312 +1312 @@
             consume();
 
-            m_generator.gernerateDisjunction(successes, failures);
+            m_generator.generateDisjunction(successes, failures);
 
             parseAlternative(failures);