Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/regexp_object.cpp

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

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

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -231 +231 @@
 }
 
-bool RegExpImp::implementsCall() const
-{
-    return true;
+CallType RegExpImp::getCallData(CallData&)
+{
+    return CallTypeNative;
 }
 
@@ -426 +426 @@
 }
   
-bool RegExpObjectImp::implementsConstruct() const
-{
-  return true;
+ConstructType RegExpObjectImp::getConstructData(ConstructData&)
+{
+    return ConstructTypeNative;
 }
 
@@ -446 +446 @@
   UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
   
-  return createRegExpImp(exec, RegExp::create(pattern, flags));
-}
-
-JSObject* RegExpObjectImp::createRegExpImp(ExecState* exec, PassRefPtr<RegExp> regExp)
-{
-    return regExp->isValid()
-        ? new RegExpImp(static_cast<RegExpPrototype*>(exec->lexicalGlobalObject()->regExpPrototype()), regExp)
-        : throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
+  RefPtr<RegExp> regExp = RegExp::create(pattern, flags);
+  return regExp->isValid()
+    ? new RegExpImp(exec->lexicalGlobalObject()->regExpPrototype(), regExp.release())
+    : throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
 }