Changeset 38603 in webkit for trunk/JavaScriptCore/runtime/RegExpObject.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/RegExpObject.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExpObject.cpp

@@ -107 +107 @@
 }
 
-bool RegExpObject::match(ExecState* exec, const ArgList& args)
-{
-    RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor();
-
-    UString input;
-    if (!args.isEmpty())
-        input = args.at(exec, 0)->toString(exec);
-    else {
-        input = regExpConstructor->input();
-        if (input.isNull()) {
-            throwError(exec, GeneralError, "No input.");
-            return false;
-        }
-    }
-
-    bool global = get(exec, exec->propertyNames().global)->toBoolean(exec);
-    int lastIndex = 0;
-    if (global) {
-        if (d->lastIndex < 0 || d->lastIndex > input.size()) {
-            d->lastIndex = 0;
-            return false;
-        }
-        lastIndex = static_cast<int>(d->lastIndex);
-    }
-
-    int foundIndex;
-    int foundLength;
-    regExpConstructor->performMatch(d->regExp.get(), input, lastIndex, foundIndex, foundLength);
-
-    if (global) {
-        lastIndex = foundIndex < 0 ? 0 : foundIndex + foundLength;
-        d->lastIndex = lastIndex;
-    }
-
-    return foundIndex >= 0;
-}
-
 JSValue* RegExpObject::test(ExecState* exec, const ArgList& args)
 {
@@ -167 +130 @@
 }
 
+// Shared implementation used by test and exec.
+bool RegExpObject::match(ExecState* exec, const ArgList& args)
+{
+    RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor();
+
+    UString input = args.isEmpty() ? regExpConstructor->input() : args.at(exec, 0)->toString(exec);
+    if (input.isNull()) {
+        throwError(exec, GeneralError, "No input to " + toString(exec) + ".");
+        return false;
+    }
+
+    if (!regExp()->global()) {
+        int position;
+        int length;
+        regExpConstructor->performMatch(d->regExp.get(), input, 0, position, length);
+        return position >= 0;
+    }
+
+    if (d->lastIndex < 0 || d->lastIndex > input.size()) {
+        d->lastIndex = 0;
+        return false;
+    }
+
+    int position;
+    int length;
+    regExpConstructor->performMatch(d->regExp.get(), input, static_cast<int>(d->lastIndex), position, length);
+    if (position < 0) {
+        d->lastIndex = 0;
+        return false;
+    }
+
+    d->lastIndex = position + length;
+    return true;
+}
+
 } // namespace JSC