Changeset 14954 in webkit for trunk/JavaScriptCore/API

Timestamp:

Jun 21, 2006, 4:10:02 PM (19 years ago)

Author:

ggaren

Message:

Fixed release build, fixed accidental infinite recursion due to
last minute global replace gone awry.

• API/APICast.h: (toRef):
• API/testapi.c: (assertEqualsAsBoolean): (assertEqualsAsNumber): (assertEqualsAsUTF8String): (assertEqualsAsCharactersPtr):
• JavaScriptCore.xcodeproj/project.pbxproj:

Location:

trunk/JavaScriptCore/API

Files:

• APICast.h (modified) (2 diffs)
• testapi.c (modified) (4 diffs)

trunk/JavaScriptCore/API/APICast.h

@@ -67 +67 @@
 inline JSValueRef toRef(KJS::JSValue* v)
 {
-    return toRef(v);
+    return reinterpret_cast<JSValueRef>(v);
 }
 
@@ -77 +77 @@
 inline JSObjectRef toRef(KJS::JSObject* o)
 {
-    return toRef(o);
+    return reinterpret_cast<JSObjectRef>(o);
 }
 
 inline JSObjectRef toRef(const KJS::JSObject* o)
 {
-    return toRef(const_cast<KJS::JSObject*>(o));
+    return reinterpret_cast<JSObjectRef>(const_cast<KJS::JSObject*>(o));
 }
 

trunk/JavaScriptCore/API/testapi.c

@@ -39 +39 @@
 static void assertEqualsAsBoolean(JSValueRef value, bool expectedValue)
 {
-    assert(JSValueToBoolean(context, value) == expectedValue);
+    if (JSValueToBoolean(context, value) != expectedValue)
+        fprintf(stderr, "assertEqualsAsBoolean failed: %p, %d\n", value, expectedValue);
 }
 
@@ -45 +46 @@
 {
     double number = JSValueToNumber(context, value);
-    assert(number == expectedValue || (isnan(number) && isnan(expectedValue)));
+    if (number != expectedValue && !(isnan(number) && isnan(expectedValue)))
+        fprintf(stderr, "assertEqualsAsNumber failed: %p, %lf\n", value, expectedValue);
 }
 
@@ -56 +58 @@
     JSCharBufferGetCharactersUTF8(valueAsString, jsBuffer, jsSize);
     
-    assert(strcmp(jsBuffer, expectedValue) == 0);
-    assert(jsSize >= strlen(jsBuffer) + 1);
+    if (strcmp(jsBuffer, expectedValue) != 0)
+        fprintf(stderr, "assertEqualsAsUTF8String strcmp failed: %s != %s\n", jsBuffer, expectedValue);
+        
+    if (jsSize < strlen(jsBuffer) + 1)
+        fprintf(stderr, "assertEqualsAsUTF8String failed: jsSize was too small\n");
 
     JSCharBufferRelease(valueAsString);
@@ -78 +83 @@
     CFRelease(expectedValueAsCFString);
 
-    assert(memcmp(jsBuffer, cfBuffer, cfLength * sizeof(UniChar)) == 0);
-    assert(jsLength == (size_t)cfLength);
+    if (memcmp(jsBuffer, cfBuffer, cfLength * sizeof(UniChar)) != 0)
+        fprintf(stderr, "assertEqualsAsCharactersPtr failed: jsBuffer != cfBuffer\n");
+    
+    if (jsLength != (size_t)cfLength)
+        fprintf(stderr, "assertEqualsAsCharactersPtr failed: jsLength(%ld) != cfLength(%ld)\n", jsLength, cfLength);
     
     JSCharBufferRelease(valueAsString);