Changeset 15376 in webkit for trunk/JavaScriptCore/API/minidom.c

Timestamp:

Jul 12, 2006, 1:12:08 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Implemented a vast number of renames and comment clarifications suggested during API review.

JSInternalString -> JSString
JS*Make -> JSValueMake*, JSObjectMake*
JSTypeCode -> JSType
JSValueIsInstanceOf -> JSValueIsInstanceOfConstructor (reads strangely well in client code)
JSGC*Protect -> JSValue*Protect
JS*Callback -> JSObject*Callback
JSGetPropertyListCallback -> JSObjectAddPropertiesToListCallback
JSPropertyEnumeratorGetNext -> JSPropertyEnumeratorGetNextName
JSString* ->

JSStringCreateWithUTF8CString, JSStringGetUTF8CString,
JSStringGetMaximumUTF8CStringSize JSStringIsEqualToUTF8CString,
JSStringCreateWithCFString, JSStringCopyCFString, JSStringCreateWithCharacters.

• Changed functions taking a JSValue out arg and returning a bool indicating whether it was set to simply return a JSValue or NULL.

• Removed JSStringGetCharacters because it's more documentation than code, and it's just a glorified memcpy built on existing API functionality.

• Moved standard library includes into the headers that actually require them.

• Standardized use of the phrase "Create Rule."

• Removed JSLock from make functions that don't allocate.

• Added exception handling to JSValueToBoolean, since we now allow callback objects to throw exceptions upon converting to boolean.

• Renamed JSGCCollect to JSGarbageCollect.

File:

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

trunk/JavaScriptCore/API/minidom.c

@@ -40 +40 @@
     JSObjectRef globalObject = JSContextGetGlobalObject(context);
     
-    JSInternalStringRef printIString = JSInternalStringCreateUTF8("print");
-    JSObjectSetProperty(context, globalObject, printIString, JSFunctionMake(context, print), kJSPropertyAttributeNone);
-    JSInternalStringRelease(printIString);
+    JSStringRef printIString = JSStringCreateWithUTF8CString("print");
+    JSObjectSetProperty(context, globalObject, printIString, JSObjectMakeFunction(context, print), kJSPropertyAttributeNone);
+    JSStringRelease(printIString);
     
-    JSInternalStringRef node = JSInternalStringCreateUTF8("Node");
-    JSObjectSetProperty(context, globalObject, node, JSConstructorMake(context, JSNode_construct), kJSPropertyAttributeNone);
-    JSInternalStringRelease(node);
+    JSStringRef node = JSStringCreateWithUTF8CString("Node");
+    JSObjectSetProperty(context, globalObject, node, JSObjectMakeConstructor(context, JSNode_construct), kJSPropertyAttributeNone);
+    JSStringRelease(node);
     
     char* scriptUTF8 = createStringWithContentsOfFile("minidom.js");
-    JSInternalStringRef script = JSInternalStringCreateUTF8(scriptUTF8);
+    JSStringRef script = JSStringCreateWithUTF8CString(scriptUTF8);
     JSValueRef exception;
     JSValueRef result = JSEvaluate(context, script, NULL, NULL, 0, &exception);
@@ -56 +56 @@
     else {
         printf("FAIL: Test script threw exception:\n");
-        JSInternalStringRef exceptionIString = JSValueCopyStringValue(context, exception);
-        CFStringRef exceptionCF = CFStringCreateWithJSInternalString(kCFAllocatorDefault, exceptionIString);
+        JSStringRef exceptionIString = JSValueToStringCopy(context, exception);
+        CFStringRef exceptionCF = JSStringCopyCFString(kCFAllocatorDefault, exceptionIString);
         CFShow(exceptionCF);
         CFRelease(exceptionCF);
-        JSInternalStringRelease(exceptionIString);
+        JSStringRelease(exceptionIString);
     }
-    JSInternalStringRelease(script);
+    JSStringRelease(script);
     free(scriptUTF8);
 
@@ -71 +71 @@
         (void)o;
     }
-    JSGCCollect();
+    JSGarbageCollect();
 #endif
     
@@ -82 +82 @@
 {
     if (argc > 0) {
-        JSInternalStringRef string = JSValueCopyStringValue(context, argv[0]);
-        size_t numChars = JSInternalStringGetMaxLengthUTF8(string);
+        JSStringRef string = JSValueToStringCopy(context, argv[0]);
+        size_t numChars = JSStringGetMaximumUTF8CStringSize(string);
         char stringUTF8[numChars];
-        JSInternalStringGetCharactersUTF8(string, stringUTF8, numChars);
+        JSStringGetUTF8CString(string, stringUTF8, numChars);
         printf("%s\n", stringUTF8);
     }
     
-    return JSUndefinedMake();
+    return JSValueMakeUndefined();
 }