Changeset 38603 in webkit for trunk/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Nov 19, 2008, 1:08:40 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-11-19 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=22361
A little more RegExp refactoring.

Consistently named variables holding the starting position at which
regexp matching should begin to "startOffset".

A few more "regExpObject" => "regExpConstructor" changes.

Refactored RegExpObject::match for clarity, and replaced a slow "get"
of the "global" property with a fast access to the global bit.

Made the error message you see when RegExpObject::match has no input a
little more informative, as in Firefox.

• runtime/RegExp.cpp: (JSC::RegExp::match):
• runtime/RegExp.h:
• runtime/RegExpObject.cpp: (JSC::RegExpObject::match):
• runtime/StringPrototype.cpp: (JSC::stringProtoFuncReplace): (JSC::stringProtoFuncMatch): (JSC::stringProtoFuncSearch):

LayoutTests:

2008-11-19 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=22361
A little more RegExp refactoring

• fast/js/regexp-test-null-string.html: Added.
• fast/js/regexp-test-null-expected.txt: Added.

File:

• trunk/JavaScriptCore/runtime/RegExp.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -114 +114 @@
 }
 
-int RegExp::match(const UString& s, int i, OwnArrayPtr<int>* ovector)
+int RegExp::match(const UString& s, int startOffset, OwnArrayPtr<int>* ovector)
 {
-    if (i < 0)
-        i = 0;
+    if (startOffset < 0)
+        startOffset = 0;
     if (ovector)
         ovector->clear();
 
-    if (i > s.size() || s.isNull())
+    if (startOffset > s.size() || s.isNull())
         return -1;
 
@@ -137 +137 @@
             ovector->set(offsetVector);
 
-        int result = m_wrecFunction(s.data(), i, s.size(), offsetVector);
+        int result = m_wrecFunction(s.data(), startOffset, s.size(), offsetVector);
 
         if (result < 0) {
@@ -166 +166 @@
         }
 
-        int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.data()), s.size(), i, offsetVector, offsetVectorSize);
+        int numMatches = jsRegExpExecute(m_regExp, reinterpret_cast<const UChar*>(s.data()), s.size(), startOffset, offsetVector, offsetVectorSize);
     
         if (numMatches < 0) {