Changeset 73124 in webkit for trunk/JavaScriptCore/runtime/RegExp.h

Timestamp:

Dec 2, 2010, 5:36:45 AM (14 years ago)

Author:

[email protected]

Message:

2010-12-02 Peter Varga <​[email protected]>

Reviewed by Gavin Barraclough.

Move regex parsing and fallback handling to runtime/RegExp.cpp
​https://bugs.webkit.org/show_bug.cgi?id=50015

• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::create): (JSC::RegExp::compile): (JSC::RegExp::match): (JSC::RegExp::printTraceData):
• runtime/RegExp.h: (JSC::RegExp::pattern):
• yarr/RegexInterpreter.cpp:
• yarr/RegexInterpreter.h:
• yarr/RegexJIT.cpp: (JSC::Yarr::RegexGenerator::compile): (JSC::Yarr::jitCompileRegex):
• yarr/RegexJIT.h: (JSC::Yarr::RegexCodeBlock::RegexCodeBlock): (JSC::Yarr::RegexCodeBlock::setFallBack): (JSC::Yarr::RegexCodeBlock::isFallBack): (JSC::Yarr::executeRegex):

File:

• trunk/JavaScriptCore/runtime/RegExp.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExp.h

@@ -42 +42 @@
         bool multiline() const { return m_flagBits & Multiline; }
 
-        const UString& pattern() const { return m_pattern; }
+        const UString& pattern() const { return m_patternString; }
 
         bool isValid() const { return !m_constructionError; }
@@ -57 +57 @@
         RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags);
 
-        void compile(JSGlobalData*);
+        enum RegExpState {
+            ParseError,
+            JITCode,
+            ByteCode
+        } m_state;
+
+        RegExpState compile(JSGlobalData*);
 
         enum FlagBits { Global = 1, IgnoreCase = 2, Multiline = 4 };
-
-        UString m_pattern; // FIXME: Just decompile m_regExp instead of storing this.
+        UString m_patternString;
         int m_flagBits;
         const char* m_constructionError;