JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/RegExp.h b/runtime/RegExp.h
index 24d4199f4c7478985cd7d3780736982708714d01..670505f773585e5220461185d8970ea62449037c 100644 (file)
--- a/runtime/RegExp.h
+++ b/runtime/RegExp.h
@@ -22,67 +22,114 @@
 #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 final : public JSCell {
+public:
+    typedef JSCell Base;
+    static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
+
+    JS_EXPORT_PRIVATE static RegExp* create(VM&, const String& pattern, RegExpFlags);
+    static const bool needsDestruction = true;
+    static void destroy(JSCell*);
+
+    bool global() const { return m_flags & FlagGlobal; }
+    bool ignoreCase() const { return m_flags & FlagIgnoreCase; }
+    bool multiline() const { return m_flags & FlagMultiline; }
+
+    const String& pattern() const { return m_patternString; }
+
+    bool isValid() const { return !m_constructionError && m_flags != InvalidFlags; }
+    const char* errorMessage() const { return m_constructionError; }
+
+    JS_EXPORT_PRIVATE int match(VM&, const String&, unsigned startOffset, Vector<int, 32>& ovector);
+    JS_EXPORT_PRIVATE MatchResult match(VM&, const String&, unsigned startOffset);
+    unsigned numSubpatterns() const { return m_numSubpatterns; }
+
+    bool hasCode()
+    {
+        return m_state != NotCompiled;
+    }

 
 

-    class RegExp : public RefCounted<RegExp> {
-    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();
+    void invalidateCode();
+
+#if ENABLE(REGEXP_TRACING)
+    void printTraceData();

 #endif
 
 #endif
 

-        bool global() const { return m_flagBits & Global; }
-        bool ignoreCase() const { return m_flagBits & IgnoreCase; }
-        bool multiline() const { return m_flagBits & Multiline; }
+    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
+    {
+        return Structure::create(vm, globalObject, prototype, TypeInfo(CellType, StructureFlags), info());
+    }

 
 

-        const UString& pattern() const { return m_pattern; }
-        const UString& flags() const { return m_flags; }
+    DECLARE_INFO;

 
 

-        bool isValid() const { return !m_constructionError; }
-        const char* errorMessage() const { return m_constructionError; }
+    RegExpKey key() { return RegExpKey(m_flags, m_patternString); }

 
 

-        int match(const UString&, int startOffset, Vector<int, 32>* ovector = 0);
-        unsigned numSubpatterns() const { return m_numSubpatterns; }
+protected:
+    void finishCreation(VM&);

 
 

-    private:
-        RegExp(JSGlobalData* globalData, const UString& pattern);
-        RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags);
+private:
+    friend class RegExpCache;
+    RegExp(VM&, const String&, RegExpFlags);

 
 

-        void compile(JSGlobalData*);
+    static RegExp* createWithoutCaching(VM&, const String&, RegExpFlags);

 
 

-        enum FlagBits { Global = 1, IgnoreCase = 2, Multiline = 4 };
+    enum RegExpState {
+        ParseError,
+        JITCode,
+        ByteCode,
+        NotCompiled
+    };

 
 

-        UString m_pattern; // FIXME: Just decompile m_regExp instead of storing this.
-        UString m_flags; // FIXME: Just decompile m_regExp instead of storing this.
-        int m_flagBits;
-        const char* m_constructionError;
-        unsigned m_numSubpatterns;
+    RegExpState m_state;

 
 

-#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;
+    void compile(VM*, Yarr::YarrCharSize);
+    void compileIfNecessary(VM&, Yarr::YarrCharSize);
+
+    void compileMatchOnly(VM*, Yarr::YarrCharSize);
+    void compileIfNecessaryMatchOnly(VM&, Yarr::YarrCharSize);
+
+#if ENABLE(YARR_JIT_DEBUG)
+    void matchCompareWithInterpreter(const String&, int startOffset, int* offsetVector, int jitResult);

 #endif
 #endif

-        JSRegExp* m_regExp;
+
+    String m_patternString;
+    RegExpFlags m_flags;
+    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
 #endif

-    };
+
+#if ENABLE(YARR_JIT)
+    Yarr::YarrCodeBlock m_regExpJITCode;
+#endif
+    std::unique_ptr<Yarr::BytecodePattern> m_regExpBytecode;
+};

 
 } // namespace JSC
 
 
 } // namespace JSC