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

Timestamp:

Nov 20, 2008, 4:23:34 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-20 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

A little more RegExp refactoring.

Created a helper function in the assembler for linking a vector of
JmpSrc to a location, and deployed it in a bunch of places.

• JavaScriptCore.xcodeproj/project.pbxproj:
• assembler/X86Assembler.h: (JSC::X86Assembler::link):
• wrec/WREC.cpp: (JSC::WREC::compileRegExp):
• wrec/WRECGenerator.cpp: (JSC::WREC::Generator::generateNonGreedyQuantifier): (JSC::WREC::Generator::generateGreedyQuantifier): (JSC::WREC::Generator::generateCharacterClassInverted): (JSC::WREC::Generator::generateParentheses): (JSC::WREC::Generator::generateParenthesesResetTrampoline): (JSC::WREC::Generator::generateAssertionBOL): (JSC::WREC::Generator::generateAssertionEOL): (JSC::WREC::Generator::generateAssertionWordBoundary): (JSC::WREC::Generator::terminateAlternative): (JSC::WREC::Generator::terminateDisjunction):
• wrec/WRECParser.cpp:
• wrec/WRECParser.h: (JSC::WREC::Parser::consumeHex):

File:

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

trunk/JavaScriptCore/wrec/WREC.cpp

@@ -50 +50 @@
 static const int outputParameter = 16;
 #endif
-                    
+
 CompiledRegExp compileRegExp(Interpreter* interpreter, const UString& pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase, bool multiline)
 {
@@ -99 +99 @@
     
     // (3) Failure:
-    //     All top-level failures link to here.
-    Generator::JmpDst failure = __ label();
-    for (unsigned i = 0; i < failures.size(); ++i)
-        __ link(failures[i], failure);
-    failures.clear();
+    //     All failures in the top-level disjunction link to here.
+    __ link(failures, __ label());
 
     // Move to the next input character and try again.