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

Timestamp:

Jul 17, 2006, 2:06:57 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Changed the initialize callback to run from least derived class (parent class) to most derived class. This enables C++ style initialization, and derived class overriding of member data.

• Added excpetion propopgation to JSObjectMake, to support initialize exceptions, and generally round out our policy of making function signatures as long as possible.

• API/JSCallbackObject.h: Use ExecState instead of ContextRef, cuz we're in C++ land now.

File:

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

trunk/JavaScriptCore/API/testapi.c

@@ -242 +242 @@
 }
 
-static bool didFinalize = false;
+static bool MyObject_didFinalize = false;
 static void MyObject_finalize(JSObjectRef object)
 {
     UNUSED_PARAM(context);
     UNUSED_PARAM(object);
-    didFinalize = true;
+    MyObject_didFinalize = true;
 }
 
@@ -291 +291 @@
 }
 
+static void Base_initialize(JSContextRef context, JSObjectRef object, JSValueRef* exception)
+{
+    assert(!JSObjectGetPrivate(object));
+    JSObjectSetPrivate(object, (void*)1);
+}
+
+static bool Base_didFinalize;
+static void Base_finalize(JSObjectRef object)
+{
+    assert((void*)3 == JSObjectGetPrivate(object));
+    Base_didFinalize = true;
+}
+
+static JSClassRef Base_class(JSContextRef context)
+{
+    static JSClassRef jsClass;
+    if (!jsClass) {
+        JSClassDefinition definition = kJSClassDefinitionNull;
+        definition.initialize = Base_initialize;
+        definition.finalize = Base_finalize;
+        jsClass = JSClassCreate(&definition);
+    }
+    return jsClass;
+}
+
+static void Derived_initialize(JSContextRef context, JSObjectRef object, JSValueRef* exception)
+{
+    assert((void*)1 == JSObjectGetPrivate(object));
+    JSObjectSetPrivate(object, (void*)2);
+}
+
+static void Derived_finalize(JSObjectRef object)
+{
+    assert((void*)2 == JSObjectGetPrivate(object));
+    JSObjectSetPrivate(object, (void*)3);
+}
+
+static JSClassRef Derived_class(JSContextRef context)
+{
+    static JSClassRef jsClass;
+    if (!jsClass) {
+        JSClassDefinition definition = kJSClassDefinitionNull;
+        definition.parentClass = Base_class(context);
+        definition.initialize = Derived_initialize;
+        definition.finalize = Derived_finalize;
+        jsClass = JSClassCreate(&definition);
+    }
+    return jsClass;
+}
+
 static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
@@ -312 +362 @@
     UNUSED_PARAM(constructorObject);
     
-    JSObjectRef result = JSObjectMake(context, NULL, 0);
+    JSObjectRef result = JSObjectMake(context, NULL, 0, NULL);
     if (argumentCount > 0) {
         JSStringRef value = JSStringCreateWithUTF8CString("value");
@@ -341 +391 @@
     JSValueRef jsOne = JSValueMakeNumber(context, 1);
     JSValueRef jsOneThird = JSValueMakeNumber(context, 1.0 / 3.0);
-    JSObjectRef jsObjectNoProto = JSObjectMake(context, NULL, JSValueMakeNull(context));
+    JSObjectRef jsObjectNoProto = JSObjectMake(context, NULL, JSValueMakeNull(context), NULL);
 
     // FIXME: test funny utf8 characters
@@ -395 +445 @@
 #endif // __APPLE__
 
-    JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL);
+    JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL, NULL);
     assert(didInitialize);
     JSStringRef myObjectIString = JSStringCreateWithUTF8CString("MyObject");
@@ -509 +559 @@
 #endif // __APPLE__
     
-    jsGlobalValue = JSObjectMake(context, NULL, NULL);
+    jsGlobalValue = JSObjectMake(context, NULL, NULL, NULL);
     JSValueProtect(context, jsGlobalValue);
     JSGarbageCollect(context);
@@ -617 +667 @@
     assert(!JSObjectGetPrivate(myConstructor));
     
-    o = JSObjectMake(context, NULL, NULL);
+    o = JSObjectMake(context, NULL, NULL, NULL);
     JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(context, 1), kJSPropertyAttributeNone, NULL);
     JSObjectSetProperty(context, o, jsCFIString,  JSValueMakeNumber(context, 1), kJSPropertyAttributeDontEnum, NULL);
@@ -640 +690 @@
     assert(JSValueIsEqual(context, v, o, NULL));
     
-    
+    exception = NULL;
+    o = JSObjectMake(context, Derived_class(context), NULL, &exception);
+    assert(!exception);
+    assert(JSObjectGetPrivate(o) == (void*)2);
+    o = NULL;
     
     char* scriptUTF8 = createStringWithContentsOfFile("testapi.js");
@@ -659 +713 @@
 
     // Allocate a few dummies so that at least one will be collected
-    JSObjectMake(context, MyObject_class(context), 0);
-    JSObjectMake(context, MyObject_class(context), 0);
+    JSObjectMake(context, MyObject_class(context), NULL, NULL);
+    JSObjectMake(context, MyObject_class(context), NULL, NULL);
     JSGarbageCollect(context);
-    assert(didFinalize);
+    assert(MyObject_didFinalize);
+    assert(Base_didFinalize);
 
     JSStringRelease(jsEmptyIString);