Changeset 15469 for trunk/JavaScriptCore/API/testapi.c

Timestamp:

07/16/06 15:17:04 (2 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Added names to functions.

• Removed GetPrivate/SetPrivate from callbackFunctions and callbackConstructors. The private data idiom is that a JS object stores its native implementation as private data. For functions and constructors, the native implementation is nothing more than the callback they already store, so supporting private data, too, confuses the idiom. If you *really* want, you can still create a custom function with private data.

• API/JSCallbackConstructor.cpp:
• API/JSCallbackConstructor.h:
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::JSCallbackFunction):
• API/JSCallbackFunction.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSObjectRef.cpp: (JSObjectMakeFunction): (JSObjectMakeFunctionWithBody): (JSObjectGetPrivate): (JSObjectSetPrivate):
• API/JSObjectRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main):

Files:

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

trunk/JavaScriptCore/API/testapi.c

@@ -571 +571 @@
 
     JSStringRef print = JSStringCreateWithUTF8CString("print");
-    JSObjectRef printFunction = JSObjectMakeFunction(context, print_callAsFunction);
+    JSObjectRef printFunction = JSObjectMakeFunction(context, print, print_callAsFunction);
     JSObjectSetProperty(context, globalObject, print, printFunction, kJSPropertyAttributeNone, NULL); 
     JSStringRelease(print);
     
-    assert(JSObjectSetPrivate(printFunction, (void*)1));
-    assert(JSObjectGetPrivate(printFunction) == (void*)1);
+    assert(!JSObjectSetPrivate(printFunction, (void*)1));
+    assert(!JSObjectGetPrivate(printFunction));
 
     JSStringRef myConstructorIString = JSStringCreateWithUTF8CString("MyConstructor");
@@ -583 +583 @@
     JSStringRelease(myConstructorIString);
     
-    assert(JSObjectSetPrivate(myConstructor, (void*)1));
-    assert(JSObjectGetPrivate(myConstructor) == (void*)1);
+    assert(!JSObjectSetPrivate(myConstructor, (void*)1));
+    assert(!JSObjectGetPrivate(myConstructor));
     
     o = JSObjectMake(context, NULL, NULL);