Changeset 35027 in webkit for trunk/JavaScriptCore/kjs/RegExpObject.cpp

Timestamp:

Jul 6, 2008, 7:49:29 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-06 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Second step in broad cleanup effort.

[ File list elided ]

WebCore:

2008-07-06 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Add #include for kjs/protect.h.

• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::loadRequestAsynchronously):

File:

• trunk/JavaScriptCore/kjs/RegExpObject.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/RegExpObject.cpp

@@ -43 +43 @@
 */
 
-RegExpObject::RegExpObject(RegExpPrototype* regexpProto, PassRefPtr<RegExp> regExp)
-  : JSObject(regexpProto)
-  , m_regExp(regExp)
-  , m_lastIndex(0)
+RegExpObject::RegExpObject(RegExpPrototype* regExpPrototype, PassRefPtr<RegExp> regExp)
+    : JSObject(regExpPrototype)
+    , m_regExp(regExp)
+    , m_lastIndex(0)
 {
 }
@@ -56 +56 @@
 bool RegExpObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
-  return getStaticValueSlot<RegExpObject, JSObject>(exec, ExecState::regExpTable(exec), this, propertyName, slot);
+    return getStaticValueSlot<RegExpObject, JSObject>(exec, ExecState::regExpTable(exec), this, propertyName, slot);
 }
 
@@ -134 +134 @@
 JSValue* RegExpObject::exec(ExecState* exec, const ArgList& args)
 {
-    return match(exec, args)
-        ? exec->lexicalGlobalObject()->regExpConstructor()->arrayOfMatches(exec)
-        :  jsNull();
+    if (match(exec, args))
+        return exec->lexicalGlobalObject()->regExpConstructor()->arrayOfMatches(exec);
+    return jsNull();
 }