Changeset 27320 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

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/string_object.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -339 +339 @@
     RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
 
-    int matchIndex = 0;
     int lastIndex = 0;
     int startPosition = 0;
@@ -352 +351 @@
     // This is either a loop (if global is set) or a one-way (if not).
     do {
-      int *ovector;
-      UString matchString = regExpObj->performMatch(reg, source, startPosition, &matchIndex, &ovector);
-      if (matchIndex == -1)
+      int matchIndex;
+      int matchLen;
+      int* ovector;
+      regExpObj->performMatch(reg, source, startPosition, matchIndex, matchLen, &ovector);
+      if (matchIndex < 0)
         break;
-      int matchLen = matchString.size();
 
       pushSourceRange(sourceRanges, sourceRangeCount, sourceRangeCapacity, UString::Range(lastIndex, matchIndex - lastIndex));
@@ -365 +365 @@
           List args;
 
-          args.append(jsString(matchString));
-
-          for (unsigned i = 0; i < reg->subPatterns(); i++) {
-              int matchStart = ovector[(i + 1) * 2];
-              int matchLen = ovector[(i + 1) * 2 + 1] - matchStart;
+          for (unsigned i = 0; i < reg->subPatterns() + 1; i++) {
+              int matchStart = ovector[i * 2];
+              int matchLen = ovector[i * 2 + 1] - matchStart;
 
               if (matchStart < 0)
@@ -525 +523 @@
     }
     RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
-    UString mstr = regExpObj->performMatch(reg, u, 0, &pos);
+    int pos;
+    int matchLength;
+    regExpObj->performMatch(reg, u, 0, pos, matchLength);
     if (id == Search) {
       result = jsNumber(pos);
     } else {
-      // Exec
+      // Match
       if ((reg->flags() & RegExp::Global) == 0) {
         // case without 'g' flag is handled like RegExp.prototype.exec
-        if (mstr.isNull()) {
+        if (pos < 0)
           result = jsNull();
-        } else {
-          result = regExpObj->arrayOfMatches(exec,mstr);
-        }
+        else
+          result = regExpObj->arrayOfMatches(exec);
       } else {
         // return array of matches
@@ -542 +541 @@
         int lastIndex = 0;
         while (pos >= 0) {
-          if (mstr.isNull())
-            list.append(jsUndefined());
-          else
-            list.append(jsString(mstr));
+          list.append(jsString(u.substr(pos, matchLength)));
           lastIndex = pos;
-          pos += mstr.isEmpty() ? 1 : mstr.size();
-          mstr = regExpObj->performMatch(reg, u, pos, &pos);
+          pos += matchLength == 0 ? 1 : matchLength;
+          regExpObj->performMatch(reg, u, pos, pos, matchLength);
         }
         if (imp)
@@ -600 +596 @@
     if (a0->isObject() && static_cast<JSObject *>(a0)->inherits(&RegExpImp::info)) {
       RegExp *reg = static_cast<RegExpImp *>(a0)->regExp();
-      if (u.isEmpty() && !reg->match(u, 0).isNull()) {
+      if (u.isEmpty() && reg->match(u, 0) >= 0) {
         // empty string matched by regexp -> empty array
         res->put(exec, exec->propertyNames().length, jsNumber(0));
@@ -607 +603 @@
       pos = 0;
       while (static_cast<uint32_t>(i) != limit && pos < u.size()) {
-        int mpos;
-        int* ovector;
-        UString mstr = reg->match(u, pos, &mpos, &ovector);
-        if (mpos < 0) {
-          delete [] ovector;
+        OwnArrayPtr<int> ovector;
+        int mpos = reg->match(u, pos, &ovector);
+        if (mpos < 0)
           break;
-        }
-        pos = mpos + (mstr.isEmpty() ? 1 : mstr.size());
-        if (mpos != p0 || !mstr.isEmpty()) {
+        int mlen = ovector[1] - ovector[0];
+        pos = mpos + (mlen == 0 ? 1 : mlen);
+        if (mpos != p0 || mlen) {
           res->put(exec,i, jsString(u.substr(p0, mpos-p0)));
-          p0 = mpos + mstr.size();
+          p0 = mpos + mlen;
           i++;
         }
@@ -627 +621 @@
             res->put(exec, i++, jsString(u.substr(spos, ovector[si * 2 + 1] - spos)));
         }
-        delete [] ovector;
       }
     } else {