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

Timestamp:

Jul 5, 2006, 10:46:00 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

Implemented JSFunctionMakeWithBody, which parses a script as a function body
in the global scope, and returns the resulting anonymous function.

I also removed private data from JSCallbackFunction. It never worked,
since JSCallbackFunction doesn't inherit from JSCallbackObject.

• API/JSCallbackConstructor.cpp: Removed.
• API/JSCallbackConstructor.h: Removed.
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::JSCallbackFunction): (KJS::JSCallbackFunction::implementsConstruct): (KJS::JSCallbackFunction::construct): (KJS::JSCallbackFunction::implementsCall): (KJS::JSCallbackFunction::callAsFunction):
• API/JSCallbackFunction.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSObjectRef.cpp: (JSFunctionMake): (JSFunctionMakeWithCallbacks):
• API/JSObjectRef.h:
• API/JSValueRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main):
• JavaScriptCore.exp: Programmatically added all symbols exported by API object files, and sorted results
• JavaScriptCore.xcodeproj/project.pbxproj:

File:

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

trunk/JavaScriptCore/API/testapi.c

@@ -501 +501 @@
     JSValueRef exception;
 
-    result = JSEvaluate(context, goodSyntaxBuf, NULL, NULL, 0, NULL);
+    result = JSEvaluate(context, goodSyntaxBuf, NULL, NULL, 1, NULL);
     assert(result);
     assert(JSValueIsEqual(context, result, jsOne));
     
-    result = JSEvaluate(context, badSyntaxBuf, NULL, NULL, 0, &exception);
+    result = JSEvaluate(context, badSyntaxBuf, NULL, NULL, 1, &exception);
     assert(!result);
     assert(!JSContextGetException(context));
@@ -537 +537 @@
     assert(!JSValueIsInstanceOf(context, JSNullMake(), arrayConstructor));
     
+    JSCharBufferRef functionBuf;
+    
+    functionBuf = JSCharBufferCreateUTF8("rreturn Array;");
+    assert(!JSFunctionMakeWithBody(context, functionBuf, NULL, 1));
+    JSCharBufferRelease(functionBuf);
+
+    functionBuf = JSCharBufferCreateUTF8("return Array;");
+    JSObjectRef function = JSFunctionMakeWithBody(context, functionBuf, NULL, 1);
+    JSCharBufferRelease(functionBuf);
+
+    assert(JSObjectIsFunction(function));
+    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
+    assert(JSValueIsEqual(context, v, arrayConstructor));
+                                                  
     JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL);
     assert(didInitialize);
@@ -548 +562 @@
 
     JSCharBufferRef myConstructorBuf = JSCharBufferCreateUTF8("MyConstructor");
-    JSObjectSetProperty(context, globalObject, myConstructorBuf, JSConstructorMake(context, myConstructor_callAsConstructor), kJSPropertyAttributeNone); 
+    JSObjectSetProperty(context, globalObject, myConstructorBuf, JSConstructorMake(context, myConstructor_callAsConstructor), kJSPropertyAttributeNone);
     JSCharBufferRelease(myConstructorBuf);
 
     char* script = createStringWithContentsOfFile("testapi.js");
     JSCharBufferRef scriptBuf = JSCharBufferCreateUTF8(script);
-    result = JSEvaluate(context, scriptBuf, NULL, NULL, 0, &exception);
+    result = JSEvaluate(context, scriptBuf, NULL, NULL, 1, &exception);
     if (JSValueIsUndefined(result))
         printf("PASS: Test script executed successfully.\n");