Changeset 27571 in webkit for trunk/JavaScriptCore/kjs/regexp_object.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_object.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -49 +49 @@
     class RegExpImp : public JSObject {
     public:
-        RegExpImp(RegExpPrototype*, RegExp*);
+        enum { Global, IgnoreCase, Multiline, Source, LastIndex };
+
+        RegExpImp(RegExpPrototype*, PassRefPtr<RegExp>);
         virtual ~RegExpImp();
 
-        void setRegExp(RegExp* r) { m_regExp.set(r); }
+        void setRegExp(PassRefPtr<RegExp> r) { m_regExp = r; }
         RegExp* regExp() const { return m_regExp.get(); }
 
@@ -60 +62 @@
         virtual bool implementsCall() const;
         virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
+        bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+        JSValue* getValueProperty(ExecState*, int token) const;
+        void put(ExecState*, const Identifier&, JSValue*, int attributes = None);
+        void putValueProperty(ExecState*, int token, JSValue*, int attributes);
+
         virtual const ClassInfo* classInfo() const { return &info; }
         static const ClassInfo info;
@@ -66 +73 @@
         bool match(ExecState*, const List& args);
 
-        OwnPtr<RegExp> m_regExp;
+        RefPtr<RegExp> m_regExp;
+        double m_lastIndex;
     };