Changeset 11034 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Nov 3, 2005, 10:11:58 AM (20 years ago)

Author:

ggaren

Message:

Reviewed by darin.

• Fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5602 REGRESSION: RegExp("[
  ^{s$]+", "g") returns extra matches}

We now update lastIndex relative to the start of the last match,
rather than the start of the last search. We used to assume that
the two were equal, but that may not be the case in $ matches.

• kjs/regexp_object.cpp: (RegExpProtoFuncImp::callAsFunction):

File:

• trunk/JavaScriptCore/kjs/regexp_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -110 +110 @@
     }
 
-    UString match = regExpObj->performMatch(regExp, input, static_cast<int>(lastIndex));
+    int foundIndex;
+    UString match = regExpObj->performMatch(regExp, input, static_cast<int>(lastIndex), &foundIndex);
     bool didMatch = !match.isNull();
 
@@ -120 +121 @@
     if (didMatch) {
       if (globalFlag)
-        thisObj->put(exec, "lastIndex", Number(lastIndex + match.size()), DontDelete | DontEnum);
+        thisObj->put(exec, "lastIndex", Number(foundIndex + match.size()), DontDelete | DontEnum);
       return regExpObj->arrayOfMatches(exec, match);
     } else {