Changeset 27320 in webkit for trunk/JavaScriptCore/kjs/regexp_object.h

Timestamp:

Oct 31, 2007, 7:46:41 AM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15749 RegExp/RegExpObjectImp cause needless UString creation

Speeds things up 0.4% according to SunSpider.

• kjs/config.h: Define USE(PCRE16) instead of HAVE(PCREPOSIX), because this library doesn't use the real PCRE -- it uses its own PCRE that works on UTF-16.

• kjs/regexp.h: Removed a few unused functions. Changed the ifdef. Use Noncopyable. Change the return value of match.
• kjs/regexp.cpp: (KJS::RegExp::RegExp): Call pcre_compile2, for a slight speed boost. (KJS::RegExp::~RegExp): PCRE16 rather than PCREPOSIX. (KJS::RegExp::match): Change to return the position as an int and the ovector as a OwnArrayPtr<int> for efficiency and clearer storage management.

• kjs/regexp_object.h: Change performMatch and arrayOfMatches to no longer require a result string.
• kjs/regexp_object.cpp: (RegExpProtoFunc::callAsFunction): Update for new signature of performMatch. (RegExpObjectImp::performMatch): Change so it doesn't return a string. (RegExpObjectImp::arrayOfMatches): Simplify by unifying the handling of the main result with the backreferences; now it doesn't need to take a result parameter. (RegExpObjectImp::getBackref): Minor tweaks. (RegExpObjectImp::getLastParen): Ditto. (RegExpObjectImp::getLeftContext): Ditto. (RegExpObjectImp::getRightContext): Ditto. (RegExpObjectImp::getValueProperty): Change LastMatch case to call getBackref(0) so we don't need a separate getLastMatch function.

• kjs/string_object.cpp: (KJS::replace): Update to use new performMatch, including merging the matched string section with the other substrings. (KJS::StringProtoFunc::callAsFunction): Update functions to use the new performMatch and match. Also change to use OwnArrayPtr.

File:

• trunk/JavaScriptCore/kjs/regexp_object.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -79 +79 @@
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     JSValue *getValueProperty(ExecState *, int token) const;
-    UString performMatch(RegExp *, const UString&, int startOffset = 0, int *endOffset = 0, int **ovector = 0);
-    JSObject *arrayOfMatches(ExecState *exec, const UString &result) const;
+    void performMatch(RegExp*, const UString&, int startOffset, int& position, int& length, int** ovector = 0);
+    JSObject* arrayOfMatches(ExecState*) const;
     
     virtual const ClassInfo *classInfo() const { return &info; }
   private:
     JSValue *getBackref(unsigned) const;
-    JSValue *getLastMatch() const;
     JSValue *getLastParen() const;
     JSValue *getLeftContext() const;