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

Timestamp:

Jul 14, 2006, 9:10:31 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Finalized exception handling in the API.

setProperty can throw because it throws for built-in arrays. getProperty
and deleteProperty can throw because setProperty can throw and we want
to be consistent, and also because they seem like "actions." callAsFunction,
callAsConstructor, and hasInstance can throw, because they caan throw for
all built-ins.

toBoolean can't throw because it's defined that way in the spec.

• Documented that toBoolean and toObject can't be overridden by custom objects because they're defined that way in the spec.

File:

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

trunk/JavaScriptCore/API/testapi.c

@@ -39 +39 @@
 static void assertEqualsAsBoolean(JSValueRef value, bool expectedValue)
 {
-    if (JSValueToBoolean(context, value, NULL) != expectedValue)
+    if (JSValueToBoolean(context, value) != expectedValue)
         fprintf(stderr, "assertEqualsAsBoolean failed: %p, %d\n", value, expectedValue);
 }
@@ -106 +106 @@
 }
 
-static bool MyObject_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
+static bool MyObject_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName)
 {
     UNUSED_PARAM(context);
@@ -160 +160 @@
         return true;
     
+    if (JSStringIsEqualToUTF8CString(propertyName, "throwOnDelete")) {
+        *exception = JSValueMakeNumber(2);
+        return false;
+    }
+
     return false;
 }
@@ -206 +211 @@
 
     JSStringRef numberString = JSStringCreateWithUTF8CString("Number");
-    JSObjectRef numberConstructor = JSValueToObject(context, JSObjectGetProperty(context, JSContextGetGlobalObject(context), numberString), NULL);
+    JSObjectRef numberConstructor = JSValueToObject(context, JSObjectGetProperty(context, JSContextGetGlobalObject(context), numberString, NULL), NULL);
     JSStringRelease(numberString);
 
-    return JSValueIsInstanceOfConstructor(context, possibleValue, numberConstructor);
+    return JSValueIsInstanceOfConstructor(context, possibleValue, numberConstructor, NULL);
 }
 
@@ -218 +223 @@
     
     switch (type) {
-    case kJSTypeBoolean:
-        *exception = JSValueMakeNumber(2);
-        return NULL;
     case kJSTypeNumber:
         return JSValueMakeNumber(1);
@@ -288 +290 @@
     if (argc > 0) {
         JSStringRef value = JSStringCreateWithUTF8CString("value");
-        JSObjectSetProperty(context, result, value, argv[0], kJSPropertyAttributeNone);
+        JSObjectSetProperty(context, result, value, argv[0], kJSPropertyAttributeNone, NULL);
         JSStringRelease(value);
     }
@@ -371 +373 @@
     assert(didInitialize);
     JSStringRef myObjectIString = JSStringCreateWithUTF8CString("MyObject");
-    JSObjectSetProperty(context, globalObject, myObjectIString, myObject, kJSPropertyAttributeNone);
+    JSObjectSetProperty(context, globalObject, myObjectIString, myObject, kJSPropertyAttributeNone, NULL);
     JSStringRelease(myObjectIString);
     
@@ -389 +391 @@
     assert(exception);
     
-    exception = NULL;
-    assert(!JSValueToBoolean(context, myObject, &exception));
-    assert(exception);
+    assert(JSValueToBoolean(context, myObject));
     
     exception = NULL;
@@ -505 +505 @@
     
     JSStringRef array = JSStringCreateWithUTF8CString("Array");
-    v = JSObjectGetProperty(context, globalObject, array);
+    v = JSObjectGetProperty(context, globalObject, array, NULL);
     assert(v);
     JSObjectRef arrayConstructor = JSValueToObject(context, v, NULL);
@@ -511 +511 @@
     result = JSObjectCallAsConstructor(context, arrayConstructor, 0, NULL, NULL);
     assert(result);
-    assert(JSValueIsInstanceOfConstructor(context, result, arrayConstructor));
-    assert(!JSValueIsInstanceOfConstructor(context, JSValueMakeNull(), arrayConstructor));
+    assert(JSValueIsInstanceOfConstructor(context, result, arrayConstructor, NULL));
+    assert(!JSValueIsInstanceOfConstructor(context, JSValueMakeNull(), arrayConstructor, NULL));
     
     JSStringRef functionBody;
@@ -521 +521 @@
     assert(!JSObjectMakeFunctionWithBody(context, functionBody, NULL, 1, &exception));
     assert(JSValueIsObject(exception));
-    v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line);
+    v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
     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)
@@ -537 +537 @@
     JSStringRef print = JSStringCreateWithUTF8CString("print");
     JSObjectRef printFunction = JSObjectMakeFunction(context, print_callAsFunction);
-    JSObjectSetProperty(context, globalObject, print, printFunction, kJSPropertyAttributeNone); 
+    JSObjectSetProperty(context, globalObject, print, printFunction, kJSPropertyAttributeNone, NULL); 
     JSStringRelease(print);
     
@@ -545 +545 @@
     JSStringRef myConstructorIString = JSStringCreateWithUTF8CString("MyConstructor");
     JSObjectRef myConstructor = JSObjectMakeConstructor(context, myConstructor_callAsConstructor);
-    JSObjectSetProperty(context, globalObject, myConstructorIString, myConstructor, kJSPropertyAttributeNone);
+    JSObjectSetProperty(context, globalObject, myConstructorIString, myConstructor, kJSPropertyAttributeNone, NULL);
     JSStringRelease(myConstructorIString);
     
@@ -552 +552 @@
     
     o = JSObjectMake(context, NULL, NULL);
-    JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(1), kJSPropertyAttributeNone);
-    JSObjectSetProperty(context, o, jsCFIString,  JSValueMakeNumber(1), kJSPropertyAttributeDontEnum);
+    JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(1), kJSPropertyAttributeNone, NULL);
+    JSObjectSetProperty(context, o, jsCFIString,  JSValueMakeNumber(1), kJSPropertyAttributeDontEnum, NULL);
     JSPropertyEnumeratorRef enumerator = JSObjectCreatePropertyEnumerator(o);
     int count = 0;