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

Timestamp:

Aug 12, 2007, 7:42:17 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14931 <rdar://problem/5403816> JavaScript regular expression non-participating capturing parentheses fail in 3 different ways

Test: fast/js/regexp-non-capturing-groups.html

• kjs/string_object.cpp: (KJS::replace): Add missing code to handle undefined backreferences; before we'd get the empty string instead of a JavaScript "undefined" value. (KJS::StringProtoFunc::callAsFunction): Implemented backreference support for split.
• pcre/pcre_exec.c: (match): Made backreferences to undefined groups match the empty string instead of always failing. Only in JAVASCRIPT mode.

• tests/mozilla/expected.html: Add a new expected test success, since this fixed one test result.

LayoutTests:

Reviewed by Maciej.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=14931 JavaScript regular expression non-participating capturing groups behave incorrectly in edge cases

• fast/js/regexp-non-capturing-groups-expected.txt: Added.
• fast/js/regexp-non-capturing-groups.html: Added.
• fast/js/resources/regexp-non-capturing-groups.js: Added.

• fast/js/resources/js-test-pre.js: Updated to add a special case for array results, since there are some array results in the test. Also cut down on the verbosity of failures when the type of the actual result is the same as the type of the expected result. And get rid of the special case function just for NaN.

• fast/js/regexp-unicode-overflow.html: Let the make-js-test-wrappers script regenerate this file (it removed one of the trailing newlines).

• fast/js/kde/encode_decode_uri-expected.txt: This test now passes. I'm not sure why it was failing before.

• fast/js/char-at-expected.txt: Removed all the periods at the end of NaN test PASS messages; they are now consistent with all the other tests.
• fast/js/date-parse-comments-test-expected.txt: Ditto.
• fast/js/date-parse-test-expected.txt: Ditto.

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -3 +3 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
- *  Copyright (C) 2004 Apple Computer, Inc.
+ *  Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -363 +363 @@
               int matchLen = ovector[(i + 1) * 2 + 1] - matchStart;
 
-              args.append(jsString(source.substr(matchStart, matchLen)));
+              if (matchStart < 0)
+                args.append(jsUndefined());
+              else
+                args.append(jsString(source.substr(matchStart, matchLen)));
           }
           
@@ -609 +612 @@
       pos = 0;
       while (static_cast<uint32_t>(i) != limit && pos < u.size()) {
-        // TODO: back references
         int mpos;
-        int *ovector = 0L;
+        int* ovector;
         UString mstr = reg->match(u, pos, &mpos, &ovector);
-        delete [] ovector; ovector = 0L;
-        if (mpos < 0)
+        if (mpos < 0) {
+          delete [] ovector;
           break;
+        }
         pos = mpos + (mstr.isEmpty() ? 1 : mstr.size());
         if (mpos != p0 || !mstr.isEmpty()) {
@@ -622 +625 @@
           i++;
         }
+        for (unsigned si = 1; si <= reg->subPatterns(); ++si) {
+          int spos = ovector[si * 2];
+          if (spos < 0)
+            res->put(exec, i++, jsUndefined());
+          else
+            res->put(exec, i++, jsString(u.substr(spos, ovector[si * 2 + 1] - spos)));
+        }
+        delete [] ovector;
       }
     } else {