Changeset 15043 in webkit for trunk/JavaScriptCore/API

Timestamp:

Jun 25, 2006, 8:12:18 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Adele.

• Added JSConstructorMake to match JSFunctionMake, along with test code.

[ I checked in the ChangeLog before without the actual files. ]

• API/JSObjectRef.cpp: (JSConstructorMake):
• API/JSObjectRef.h:
• API/testapi.c: (myConstructor_callAsConstructor): (main):
• API/testapi.js:
• ChangeLog:
• JavaScriptCore.xcodeproj/project.pbxproj: Moved testapi.c to the testapi target -- this was an oversight in my earlier check-in.

Location:

trunk/JavaScriptCore/API

Files:

• JSObjectRef.cpp (modified) (1 diff)
• JSObjectRef.h (modified) (1 diff)
• testapi.c (modified) (2 diffs)
• testapi.js (modified) (1 diff)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -77 +77 @@
 }
 
+JSObjectRef JSConstructorMake(JSContextRef context, JSCallAsConstructorCallback callback)
+{
+    ExecState* exec = toJS(context);
+    JSObjectCallbacks callbacks = kJSObjectCallbacksNone;
+    callbacks.callAsConstructor = callback;
+    
+    return JSObjectMake(context, &callbacks, toRef(exec->lexicalInterpreter()->builtinObjectPrototype()));
+}
+
 JSCharBufferRef JSObjectGetDescription(JSObjectRef object)
 {

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -98 +98 @@
 // Will be assigned the built-in function prototype
 JSObjectRef JSFunctionMake(JSContextRef context, JSCallAsFunctionCallback callback);
+// Will be assigned the built-in object prototype
+JSObjectRef JSConstructorMake(JSContextRef context, JSCallAsConstructorCallback callback);
 
 JSCharBufferRef JSObjectGetDescription(JSObjectRef object);

trunk/JavaScriptCore/API/testapi.c

@@ -285 +285 @@
 }
 
+static JSObjectRef myConstructor_callAsConstructor(JSContextRef context, JSObjectRef constructorObject, size_t argc, JSValueRef argv[])
+{
+    UNUSED_PARAM(constructorObject);
+    
+    JSObjectRef result = JSObjectMake(context, &kJSObjectCallbacksNone, 0);
+    if (argc > 0) {
+        JSCharBufferRef valueBuffer = JSCharBufferCreateUTF8("value");
+        JSObjectSetProperty(context, result, valueBuffer, argv[0], kJSPropertyAttributeNone);
+        JSCharBufferRelease(valueBuffer);
+    }
+    
+    return result;
+}
+
 static char* createStringWithContentsOfFile(const char* fileName);
 
@@ -502 +516 @@
     JSObjectSetProperty(context, globalObject, printBuf, JSFunctionMake(context, print_callAsFunction), kJSPropertyAttributeNone); 
     JSCharBufferRelease(printBuf);
+
+    JSCharBufferRef myConstructorBuf = JSCharBufferCreateUTF8("MyConstructor");
+    JSObjectSetProperty(context, globalObject, myConstructorBuf, JSConstructorMake(context, myConstructor_callAsConstructor), kJSPropertyAttributeNone); 
+    JSCharBufferRelease(myConstructorBuf);
 
     char* script = createStringWithContentsOfFile("testapi.js");

trunk/JavaScriptCore/API/testapi.js

@@ -77 +77 @@
 shouldBe("(MyObject + '').indexOf('MyObject') != -1", true); // toString
 shouldBe("MyObject - 0", NaN); // toPrimitive
+
+shouldBe("typeof MyConstructor", "object");
+constructedObject = new MyConstructor(1);
+shouldBe("typeof constructedObject", "object");
+shouldBe("constructedObject.value", 1);