JavaScriptCore-7600.1.4.15.12.tar.gz

[apple/javascriptcore.git] / runtime / RegExp.h

diff --git a/runtime/RegExp.h b/runtime/RegExp.h
index 61ab0bc284d17a15242936fbe3969b3a2b26f0be..fec8f6a6fa2ac754c4ab88769228e8b019c698af 100644 (file)
--- a/runtime/RegExp.h
+++ b/runtime/RegExp.h
@@ -22,64 +22,113 @@
 #ifndef RegExp_h
 #define RegExp_h
 
 #ifndef RegExp_h
 #define RegExp_h
 

-#include "UString.h"
-#include "WREC.h"

 #include "ExecutableAllocator.h"
 #include "ExecutableAllocator.h"

+#include "MatchResult.h"
+#include "RegExpKey.h"
+#include "Structure.h"
+#include "yarr/Yarr.h"

 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>

-#include "yarr/RegexJIT.h"
-#include "yarr/RegexInterpreter.h"
+#include <wtf/text/WTFString.h>

 
 

-struct JSRegExp;
+#if ENABLE(YARR_JIT)
+#include "yarr/YarrJIT.h"
+#endif

 
 namespace JSC {
 
 
 namespace JSC {
 

-    class JSGlobalData;
+    struct RegExpRepresentation;
+    class VM;
+
+    JS_EXPORT_PRIVATE RegExpFlags regExpFlags(const String&);

 
 

-    class RegExp : public RefCounted<RegExp> {
+    class RegExp : public JSCell {

     public:
     public:

-        static PassRefPtr<RegExp> create(JSGlobalData* globalData, const UString& pattern);
-        static PassRefPtr<RegExp> create(JSGlobalData* globalData, const UString& pattern, const UString& flags);
-#if !ENABLE(YARR)
-        ~RegExp();
-#endif
+        typedef JSCell Base;
+
+        JS_EXPORT_PRIVATE static RegExp* create(VM&, const String& pattern, RegExpFlags);
+        static const bool needsDestruction = true;
+        static const bool hasImmortalStructure = true;
+        static void destroy(JSCell*);

 
 

-        bool global() const { return m_flagBits & Global; }
-        bool ignoreCase() const { return m_flagBits & IgnoreCase; }
-        bool multiline() const { return m_flagBits & Multiline; }
+        bool global() const { return m_flags & FlagGlobal; }
+        bool ignoreCase() const { return m_flags & FlagIgnoreCase; }
+        bool multiline() const { return m_flags & FlagMultiline; }

 
 

-        const UString& pattern() const { return m_pattern; }
+        const String& pattern() const { return m_patternString; }

 
 

-        bool isValid() const { return !m_constructionError; }
+        bool isValid() const { return !m_constructionError && m_flags != InvalidFlags; }

         const char* errorMessage() const { return m_constructionError; }
 
         const char* errorMessage() const { return m_constructionError; }
 

-        int match(const UString&, int startOffset, Vector<int, 32>* ovector = 0);
+        JS_EXPORT_PRIVATE int match(VM&, const String&, unsigned startOffset, Vector<int, 32>& ovector);
+        MatchResult match(VM&, const String&, unsigned startOffset);

         unsigned numSubpatterns() const { return m_numSubpatterns; }
 
         unsigned numSubpatterns() const { return m_numSubpatterns; }
 

+        bool hasCode()
+        {
+            return m_state != NotCompiled;
+        }
+
+        void invalidateCode();
+        
+#if ENABLE(REGEXP_TRACING)
+        void printTraceData();
+#endif
+
+        static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
+        {
+            return Structure::create(vm, globalObject, prototype, TypeInfo(LeafType, StructureFlags), info());
+        }
+        
+        DECLARE_INFO;
+
+        RegExpKey key() { return RegExpKey(m_flags, m_patternString); }
+
+    protected:
+        static const unsigned StructureFlags = StructureIsImmortal;
+
+        void finishCreation(VM&);
+

     private:
     private:

-        RegExp(JSGlobalData* globalData, const UString& pattern);
-        RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags);
+        friend class RegExpCache;
+        RegExp(VM&, const String&, RegExpFlags);
+
+        static RegExp* createWithoutCaching(VM&, const String&, RegExpFlags);
+
+        enum RegExpState {
+            ParseError,
+            JITCode,
+            ByteCode,
+            NotCompiled
+        } m_state;
+
+        void compile(VM*, Yarr::YarrCharSize);
+        void compileIfNecessary(VM&, Yarr::YarrCharSize);

 
 

-        void compile(JSGlobalData*);
+        void compileMatchOnly(VM*, Yarr::YarrCharSize);
+        void compileIfNecessaryMatchOnly(VM&, Yarr::YarrCharSize);

 
 

-        enum FlagBits { Global = 1, IgnoreCase = 2, Multiline = 4 };
+#if ENABLE(YARR_JIT_DEBUG)
+        void matchCompareWithInterpreter(const String&, int startOffset, int* offsetVector, int jitResult);
+#endif

 
 

-        UString m_pattern; // FIXME: Just decompile m_regExp instead of storing this.
-        int m_flagBits;
+        String m_patternString;
+        RegExpFlags m_flags;

         const char* m_constructionError;
         unsigned m_numSubpatterns;
         const char* m_constructionError;
         unsigned m_numSubpatterns;

+#if ENABLE(REGEXP_TRACING)
+        double m_rtMatchOnlyTotalSubjectStringLen;
+        double m_rtMatchTotalSubjectStringLen;
+        unsigned m_rtMatchOnlyCallCount;
+        unsigned m_rtMatchOnlyFoundCount;
+        unsigned m_rtMatchCallCount;
+        unsigned m_rtMatchFoundCount;
+#endif

 
 #if ENABLE(YARR_JIT)
 
 #if ENABLE(YARR_JIT)

-        Yarr::RegexCodeBlock m_regExpJITCode;
-#elif ENABLE(YARR)
-        OwnPtr<Yarr::BytecodePattern> m_regExpBytecode;
-#else
-#if ENABLE(WREC)
-        WREC::CompiledRegExp m_wrecFunction;
-        RefPtr<ExecutablePool> m_executablePool;
-#endif
-        JSRegExp* m_regExp;
+        Yarr::YarrCodeBlock m_regExpJITCode;

 #endif
 #endif

+        OwnPtr<Yarr::BytecodePattern> m_regExpBytecode;

     };
 
 } // namespace JSC
     };
 
 } // namespace JSC