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

Timestamp:

Mar 25, 2008, 4:23:31 PM (17 years ago)

Author:

Adam Roben

Message:

Make testapi.c compile under MSVC

Currently you must compile testapi.c as C++ code since MSVC does not
support many C features that GCC does.

Reviewed by Steve Falkenburg.

• API/testapi.c: (nan): Added an implementation of this for MSVC. (assertEqualsAsUTF8String): Use malloc instead of dynamically-sized stack arrays. (assertEqualsAsCharactersPtr): Ditto. (print_callAsFunction): Ditto. (main): Ditto, and explicitly cast from UniChar* to JSChar*.

File:

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

trunk/JavaScriptCore/API/testapi.c

@@ -30 +30 @@
 #include <wtf/UnusedParam.h>
 
+#if COMPILER(MSVC)
+
+#include <wtf/MathExtras.h>
+
+static double nan(const char*)
+{
+    return std::numeric_limits<double>::quiet_NaN();
+}
+
+#endif
+
 static JSGlobalContextRef context = 0;
 
@@ -54 +65 @@
 
     size_t jsSize = JSStringGetMaximumUTF8CStringSize(valueAsString);
-    char jsBuffer[jsSize];
+    char* jsBuffer = (char*)malloc(jsSize);
     JSStringGetUTF8CString(valueAsString, jsBuffer, jsSize);
     
@@ -65 +76 @@
         fprintf(stderr, "assertEqualsAsUTF8String failed: jsSize was too small\n");
 
+    free(jsBuffer);
     JSStringRelease(valueAsString);
 }
@@ -79 +91 @@
                                                                     kCFStringEncodingUTF8);    
     CFIndex cfLength = CFStringGetLength(expectedValueAsCFString);
-    UniChar cfBuffer[cfLength];
+    UniChar* cfBuffer = (UniChar*)malloc(cfLength * sizeof(UniChar));
     CFStringGetCharacters(expectedValueAsCFString, CFRangeMake(0, cfLength), cfBuffer);
     CFRelease(expectedValueAsCFString);
@@ -89 +101 @@
         fprintf(stderr, "assertEqualsAsCharactersPtr failed: jsLength(%ld) != cfLength(%ld)\n", jsLength, cfLength);
     
+    free(cfBuffer);
     JSStringRelease(valueAsString);
 }
@@ -444 +457 @@
         JSStringRef string = JSValueToStringCopy(context, arguments[0], NULL);
         size_t sizeUTF8 = JSStringGetMaximumUTF8CStringSize(string);
-        char stringUTF8[sizeUTF8];
+        char* stringUTF8 = (char*)malloc(sizeUTF8);
         JSStringGetUTF8CString(string, stringUTF8, sizeUTF8);
         printf("%s\n", stringUTF8);
+        free(stringUTF8);
         JSStringRelease(string);
     }
@@ -600 +614 @@
 
     CFIndex cfStringLength = CFStringGetLength(cfString);
-    UniChar buffer[cfStringLength];
+    UniChar* buffer = (UniChar*)malloc(cfStringLength * sizeof(UniChar));
     CFStringGetCharacters(cfString, 
                           CFRangeMake(0, cfStringLength), 
                           buffer);
-    JSStringRef jsCFIStringWithCharacters = JSStringCreateWithCharacters(buffer, cfStringLength);
+    JSStringRef jsCFIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, cfStringLength);
     JSValueRef jsCFStringWithCharacters = JSValueMakeString(context, jsCFIStringWithCharacters);
     
-    JSStringRef jsCFEmptyIStringWithCharacters = JSStringCreateWithCharacters(buffer, CFStringGetLength(cfEmptyString));
+    JSStringRef jsCFEmptyIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, CFStringGetLength(cfEmptyString));
+    free(buffer);
     JSValueRef jsCFEmptyStringWithCharacters = JSValueMakeString(context, jsCFEmptyIStringWithCharacters);