Changeset 27571 in webkit for trunk/JavaScriptCore/kjs/regexp.h

Timestamp:

Nov 7, 2007, 9:18:39 AM (18 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Darin Adler.

Fixed part of ​http://bugs.webkit.org/show_bug.cgi?id=15861
15% of string-validate-input.js is spent compiling the same regular expression.

Put RegExpImp properties into a static hashtable to avoid a slew of
PropertyMap churn when creating a RegExpImp.

Factored important bits of regular expression implementation out of
RegExpImp (the JS object) and into RegExp (the PCRE wrapper class),
making RegExp a ref-counted class. (This will help later.)

Removed PCRE_POSIX support because I didn't quite know how to test it
and keep it working with these changes.

1.1% SunSpider speedup. 5.8% speedup on string-validate-input.js.

• kjs/regexp.h: A few interface changes:

1. Renamed "subpatterns()" => "numSubpatterns()"
2. Made flag enumeration private and replaced it with public getters for specific flags.
3. Made RegExp ref-counted so RegExps can be shared by RegExpImps.
4. Made RegExp take a string of flags instead of an int, eliminating duplicated flag parsing code elsewhere.

• kjs/regexp_object.cpp: (KJS::RegExpProtoFunc::callAsFunction): For RegExp.compile:
• Fixed a bug where compile(undefined) would throw an exception.
• Removed some now-redundant code.
• Used RegExp sharing to eliminate an allocation and a bunch of PropertyMap thrash. (Not a big win since compile is a deprecated function. I mainly did this to test the plubming.)

LayoutTests:

Reviewed by Darin Adler.

Beefed up the RegExp.compile testcase to cover a mistake in the
original check-in and a mistake I made while developing my new patch.

• fast/js/resources/regexp-compile.js:

File:

• trunk/JavaScriptCore/kjs/regexp.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/regexp.h

@@ -23 +23 @@
 #define KJS_REGEXP_H
 
+#include "ustring.h"
+#include <pcre.h>
 #include <sys/types.h>
-
-#if !USE(POSIX_REGEX)
-#include <pcre.h>
-#else
-// POSIX regex - not so good.
-extern "C" { // bug with some libc5 distributions
-#include <regex.h>
-}
-#endif
-
-#include "ustring.h"
 #include <wtf/OwnArrayPtr.h>
 
@@ -40 +31 @@
 
   class RegExp : Noncopyable {
+  private:
+    enum { 
+        Global = 1, 
+        IgnoreCase = 2, 
+        Multiline = 4 
+    };
+
   public:
-    enum { None = 0, Global = 1, IgnoreCase = 2, Multiline = 4 };
+    RegExp(const UString& pattern);
+    RegExp(const UString& pattern, const UString& flags);
+    ~RegExp();
+    
+    void ref() { ++m_refCount; }
+    void deref() { if (--m_refCount == 0) delete this; }
+    int refCount() { return m_refCount; }
 
-    RegExp(const UString& pattern, int flags = None);
-    ~RegExp();
+    bool global() const { return m_flags & Global; }
+    bool ignoreCase() const { return m_flags & IgnoreCase; }
+    bool multiline() const { return m_flags & Multiline; }
+    const UString& pattern() const { return m_pattern; }
 
-    int flags() const { return m_flags; }
     bool isValid() const { return !m_constructionError; }
     const char* errorMessage() const { return m_constructionError; }
 
     int match(const UString&, int offset, OwnArrayPtr<int>* ovector = 0);
-    unsigned subPatterns() const { return m_numSubPatterns; }
+    unsigned numSubpatterns() const { return m_numSubpatterns; }
 
   private:
-#if !USE(POSIX_REGEX)
-    JSRegExp* m_regex;
-#else
-    regex_t m_regex;
-#endif
+    void compile();
+    
+    int m_refCount;
+    
+    // Data supplied by caller.
+    UString m_pattern;
     int m_flags;
+
+    // Data supplied by PCRE.
+    JSRegExp* m_regExp;
     char* m_constructionError;
-    unsigned m_numSubPatterns;
+    unsigned m_numSubpatterns;
   };