Changeset 15480 in webkit for trunk/JavaScriptCore/API/testapi.c

Timestamp:

Jul 16, 2006, 9:41:01 PM (19 years ago)

Author:

ggaren

Message:

Approved by Maciej, RS by Beth.

JSObjectMakeFunction -> JSObjectMakeFunctionWithCallback
JSObjectMakeFunctionWithBody -> JSObjectMakeFunction

because the latter is more common, and more fundamental, than the former.

• API/APICast.h: (toJS):
• API/JSBase.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::getPropertyNames): (KJS::JSCallbackObject::staticValueGetter): (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): (OpaqueJSClass::~OpaqueJSClass):
• API/JSClassRef.h:
• API/JSObjectRef.cpp: (JSClassCreate): (JSObjectMakeFunctionWithCallback): (JSObjectMakeFunction): (OpaqueJSPropertyNameArray::OpaqueJSPropertyNameArray): (JSObjectCopyPropertyNames):
• API/JSObjectRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main):
• ChangeLog:
• JavaScriptCore.exp:

File:

• trunk/JavaScriptCore/API/testapi.c (modified) (6 diffs)

trunk/JavaScriptCore/API/testapi.c

@@ -561 +561 @@
     functionBody = JSStringCreateWithUTF8CString("rreturn Array;");
     JSStringRef line = JSStringCreateWithUTF8CString("line");
-    assert(!JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, &exception));
+    assert(!JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, &exception));
     assert(JSValueIsObject(exception));
     v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
@@ -570 +570 @@
     exception = NULL;
     functionBody = JSStringCreateWithUTF8CString("return Array;");
-    function = JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, &exception);
+    function = JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, &exception);
     JSStringRelease(functionBody);
     assert(!exception);
@@ -579 +579 @@
     
     exception = NULL;
-    function = JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, jsEmptyIString, NULL, 0, &exception);
+    function = JSObjectMakeFunction(context, NULL, 0, NULL, jsEmptyIString, NULL, 0, &exception);
     assert(!exception);
     v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, &exception);
@@ -590 +590 @@
     JSStringRef argumentNames[] = { foo };
     functionBody = JSStringCreateWithUTF8CString("return foo;");
-    function = JSObjectMakeFunctionWithBody(context, foo, 1, argumentNames, functionBody, NULL, 1, &exception);
+    function = JSObjectMakeFunction(context, foo, 1, argumentNames, functionBody, NULL, 1, &exception);
     assert(function && !exception);
     JSValueRef arguments[] = { JSValueMakeNumber(2) };
@@ -602 +602 @@
 
     JSStringRef print = JSStringCreateWithUTF8CString("print");
-    JSObjectRef printFunction = JSObjectMakeFunction(context, print, print_callAsFunction);
+    JSObjectRef printFunction = JSObjectMakeFunctionWithCallback(context, print, print_callAsFunction);
     JSObjectSetProperty(context, globalObject, print, printFunction, kJSPropertyAttributeNone, NULL); 
     JSStringRelease(print);
@@ -633 +633 @@
     
     functionBody = JSStringCreateWithUTF8CString("return this;");
-    function = JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, NULL);
+    function = JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, NULL);
     JSStringRelease(functionBody);
     v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);