Changeset 15224 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Jul 7, 2006, 7:02:47 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

More API action.

• Headerdoc finished

Semantic Changes:

• Added a JSContextRef argument to many functions, because you need a JSContextRef for doing virtually anything. I expect to add this argument to even more functions in a future patch.

• Removed the globalObjectPrototype argument to JSContextCreate because you can't create an object until you have a context, so it's impossible to pass a prototype object to JSContextCreate. That's OK because (1) there's no reason to give the global object a prototype and (2) if you really want to, you can just use a separate call to JSObjectSetPrototype.

• Removed the JSClassRef argument to JSClassCreate because it was unnecessary, and you need to be able to make the global object's class before you've created a JSContext.

• Added an optional exception parameter to JSFunctionMakeWithBody because anything less would be uncivilized.

• Made the return value parameter to JSObjectGetProperty optional to match all other return value parameters in the API.

• Made JSObjectSetPrivate/JSObjectGetPrivate work on JSCallbackFunctions and JSCallbackConstructors. You could use an abstract base class or strategic placement of m_privateData in the class structure to implement this, but the former seemed like overkill, and the latter seemed too dangerous.

• Fixed a bug where JSPropertyEnumeratorGetNext would skip the first property.

Cosmetic Changes:

• Reversed the logic of the JSChar #ifdef to avoid confusing headerdoc

• Removed function names from @function declarations because headeroc can parse them automatically, and I wanted to rule out manual mismatch.

• Changed Error::create to take a const UString& instead of a UString* because it was looking at me funny.

• Renamed JSStringBufferCreateWithCFString to JSStringBufferCreateCF because the latter is more concise and it matches JSStringBufferCreateUTF8.

• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::getOwnPropertySlot): (KJS::JSCallbackObject::put): (KJS::JSCallbackObject::deleteProperty): (KJS::JSCallbackObject::getPropertyList): (KJS::JSCallbackObject::toBoolean): (KJS::JSCallbackObject::toNumber): (KJS::JSCallbackObject::toString):
• API/JSClassRef.cpp: (JSClassCreate):
• API/JSContextRef.cpp: (JSContextCreate): (JSContextSetException):
• API/JSContextRef.h:
• API/JSNode.c: (JSNodePrototype_class): (JSNode_class):
• API/JSNodeList.c: (JSNodeListPrototype_class): (JSNodeList_class):
• API/JSObjectRef.cpp: (JSObjectGetProperty): (JSObjectGetPrivate): (JSObjectSetPrivate): (JSObjectCallAsFunction): (JSObjectCallAsConstructor): (JSPropertyEnumeratorGetNext):
• API/JSObjectRef.h:
• API/JSStringBufferRef.cpp: (JSStringBufferCreateCF):
• API/JSStringBufferRef.h:
• API/JSValueRef.cpp: (JSValueIsInstanceOf):
• API/JSValueRef.h:
• API/minidom.c: (main):
• API/minidom.js:
• API/testapi.c: (MyObject_hasProperty): (MyObject_setProperty): (MyObject_deleteProperty): (MyObject_getPropertyList): (MyObject_convertToType): (MyObject_class): (main):
• JavaScriptCore.exp:

File:

• trunk/JavaScriptCore/API/JSObjectRef.cpp (modified) (8 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -71 +71 @@
 }
 
-JSObjectRef JSFunctionMakeWithBody(JSContextRef context, JSStringBufferRef body, JSStringBufferRef sourceURL, int startingLineNumber)
+JSObjectRef JSFunctionMakeWithBody(JSContextRef context, JSStringBufferRef body, JSStringBufferRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     JSLock lock;
@@ -77 +77 @@
     ExecState* exec = toJS(context);
     UString::Rep* bodyRep = toJS(body);
-    UString::Rep* sourceURLRep = toJS(sourceURL);
+    UString jsSourceURL = UString(toJS(sourceURL));
+
     if (!bodyRep)
         bodyRep = &UString::Rep::null;
-    RefPtr<FunctionBodyNode> bodyNode = Parser::parse(UString(sourceURLRep), startingLineNumber, bodyRep->data(), bodyRep->size(), NULL, NULL, NULL);
-    if (!bodyNode)
+    
+    int sid;
+    int errLine;
+    UString errMsg;
+    RefPtr<FunctionBodyNode> bodyNode = Parser::parse(jsSourceURL, startingLineNumber, bodyRep->data(), bodyRep->size(), &sid, &errLine, &errMsg);
+    if (!bodyNode) {
+        if (exception)
+            *exception = Error::create(exec, SyntaxError, errMsg, errLine, sid, jsSourceURL);
         return NULL;
+    }
 
     ScopeChain scopeChain;
@@ -127 +135 @@
     UString::Rep* nameRep = toJS(propertyName);
 
-    *value = toRef(jsObject->get(exec, Identifier(nameRep)));
-    return !JSValueIsUndefined(*value);
+    JSValue* jsValue = jsObject->get(exec, Identifier(nameRep));
+    if (value)
+        *value = toRef(jsValue);
+    return !jsValue->isUndefined();
 }
 
@@ -161 +171 @@
     JSObject* jsObject = toJS(object);
     
-    if (!jsObject->inherits(&JSCallbackObject::info))
-        return 0;
-    
-    return static_cast<JSCallbackObject*>(jsObject)->getPrivate();
+    if (jsObject->inherits(&JSCallbackObject::info))
+        return static_cast<JSCallbackObject*>(jsObject)->getPrivate();
+    
+    if (jsObject->inherits(&JSCallbackFunction::info))
+        return static_cast<JSCallbackFunction*>(jsObject)->getPrivate();
+    
+    if (jsObject->inherits(&JSCallbackConstructor::info))
+        return static_cast<JSCallbackConstructor*>(jsObject)->getPrivate();
+    
+    return 0;
 }
 
@@ -171 +187 @@
     JSObject* jsObject = toJS(object);
     
-    if (!jsObject->inherits(&JSCallbackObject::info))
-        return false;
-    
-    static_cast<JSCallbackObject*>(jsObject)->setPrivate(data);
-    return true;
+    if (jsObject->inherits(&JSCallbackObject::info)) {
+        static_cast<JSCallbackObject*>(jsObject)->setPrivate(data);
+        return true;
+    }
+        
+    if (jsObject->inherits(&JSCallbackFunction::info)) {
+        static_cast<JSCallbackFunction*>(jsObject)->setPrivate(data);
+        return true;
+    }
+        
+    if (jsObject->inherits(&JSCallbackConstructor::info)) {
+        static_cast<JSCallbackConstructor*>(jsObject)->setPrivate(data);
+        return true;
+    }
+    
+    return false;
 }
 
@@ -194 +221 @@
     for (size_t i = 0; i < argc; i++)
         argList.append(toJS(argv[i]));
-    
-    JSValueRef result = toRef(jsObject->call(exec, jsThisObject, argList));
+
+    JSValueRef result = toRef(jsObject->call(exec, jsThisObject, argList)); // returns NULL if object->implementsCall() is false
     if (exec->hadException()) {
         if (exception)
@@ -221 +248 @@
         argList.append(toJS(argv[i]));
     
-    JSObjectRef result = toRef(jsObject->construct(exec, argList));
+    JSObjectRef result = toRef(jsObject->construct(exec, argList)); // returns NULL if object->implementsCall() is false
     if (exec->hadException()) {
         if (exception)
@@ -260 +287 @@
     ReferenceListIterator& iterator = enumerator->iterator;
     if (iterator != enumerator->list.end()) {
+        JSStringBufferRef result = toRef(iterator->getPropertyName(exec).ustring().rep());
         iterator++;
-        return toRef(iterator->getPropertyName(exec).ustring().rep());
+        return result;
     }
     return 0;