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

Timestamp:

Jul 10, 2006, 2:17:26 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Darin.

Improved type safety by implementing opaque JSValue/JSObject typing through
abuse of 'const', not void*. Also fixed an alarming number of bugs
exposed by this new type safety.

I made one design change in JavaScriptCore, which is that the JSObject
constructor should take a JSValue* as its prototype argument, not a JSObject*,
since we allow the prototype to be any JSValue*, including jsNull(), for
example.

• API/APICast.h: (toJS):
• API/JSBase.h:
• API/JSCallbackConstructor.cpp: (KJS::JSCallbackConstructor::construct):
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::callAsFunction):
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::JSCallbackObject): (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::construct): (KJS::JSCallbackObject::callAsFunction): (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSCallbackObject.h:
• API/JSContextRef.cpp: (JSEvaluate):
• API/JSNode.c: (JSNodePrototype_appendChild): (JSNodePrototype_removeChild): (JSNodePrototype_replaceChild):
• API/JSObjectRef.cpp: (JSObjectMake): (JSFunctionMakeWithBody): (JSObjectGetProperty): (JSObjectCallAsFunction): (JSObjectCallAsConstructor):
• API/JSObjectRef.h:
• API/testapi.c: (main):
• ChangeLog:
• kjs/object.h: (KJS::JSObject::JSObject):

File:

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

trunk/JavaScriptCore/API/testapi.c

@@ -553 +553 @@
     assert(!JSFunctionMakeWithBody(context, functionBuf, NULL, 1, &exception));
     assert(JSValueIsObject(exception));
-    v = JSObjectGetProperty(context, exception, lineBuf);
+    v = JSObjectGetProperty(context, JSValueToObject(context, exception), lineBuf);
     assert(v);
     assertEqualsAsNumber(v, 2); // FIXME: Lexer::setCode bumps startingLineNumber by 1 -- we need to change internal callers so that it doesn't have to (saying '0' to mean '1' in the API would be really confusing -- it's really confusing internally, in fact)
@@ -574 +574 @@
 
     JSInternalStringRef printBuf = JSInternalStringCreateUTF8("print");
-    JSValueRef printFunction = JSFunctionMake(context, print_callAsFunction);
+    JSObjectRef printFunction = JSFunctionMake(context, print_callAsFunction);
     JSObjectSetProperty(context, globalObject, printBuf, printFunction, kJSPropertyAttributeNone); 
     JSInternalStringRelease(printBuf);
@@ -582 +582 @@
 
     JSInternalStringRef myConstructorBuf = JSInternalStringCreateUTF8("MyConstructor");
-    JSValueRef myConstructor = JSConstructorMake(context, myConstructor_callAsConstructor);
+    JSObjectRef myConstructor = JSConstructorMake(context, myConstructor_callAsConstructor);
     JSObjectSetProperty(context, globalObject, myConstructorBuf, myConstructor, kJSPropertyAttributeNone);
     JSInternalStringRelease(myConstructorBuf);
@@ -590 +590 @@
     
     o = JSObjectMake(context, NULL, NULL);
-    JSObjectSetProperty(context, o, jsOneString, JSNumberMake(1), kJSPropertyAttributeNone);
-    JSObjectSetProperty(context, o, jsCFString,  JSNumberMake(1), kJSPropertyAttributeDontEnum);
+    JSObjectSetProperty(context, o, jsOneStringBuf, JSNumberMake(1), kJSPropertyAttributeNone);
+    JSObjectSetProperty(context, o, jsCFStringBuf,  JSNumberMake(1), kJSPropertyAttributeDontEnum);
     JSPropertyEnumeratorRef enumerator = JSObjectCreatePropertyEnumerator(context, o);
     int count = 0;