Reviewed by Maciej.

        - Change getProperty* to return undefined, rather than NULL, for missing
        properties, since that's what the spec says. Also added exception out
        parameters to the *Index functions, because they can call through to the
        regular functions, which can throw for custom objects.

        * API/JSObjectRef.cpp:
        (JSObjectGetProperty):
        (JSObjectGetPropertyAtIndex):
        (JSObjectSetPropertyAtIndex):
        * API/JSObjectRef.h:
        * API/testapi.c:
        (main):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/JSObjectRef.cpp b/JavaScriptCore/API/JSObjectRef.cpp
index 7fc01366eea7abc667e689ead1aa2b261498d06c..a2619e593b669db7bece0daa60e298010bf3ca47 100644 (file)
--- a/JavaScriptCore/API/JSObjectRef.cpp
+++ b/JavaScriptCore/API/JSObjectRef.cpp
@@ -148,8 +148,6 @@ JSValueRef JSObjectGetProperty(JSContextRef context, JSObjectRef object, JSStrin
     UString::Rep* nameRep = toJS(propertyName);
 
     JSValue* jsValue = jsObject->get(exec, Identifier(nameRep));
-    if (jsValue->isUndefined())
-        jsValue = 0;
     if (exec->hadException()) {
         if (exception)
             *exception = toRef(exec->exception());
@@ -174,20 +172,23 @@ void JSObjectSetProperty(JSContextRef context, JSObjectRef object, JSStringRef p
     }
 }
 
-JSValueRef JSObjectGetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex)
+JSValueRef JSObjectGetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception)
 {
     JSLock lock;
     ExecState* exec = toJS(context);
     JSObject* jsObject = toJS(object);
 
     JSValue* jsValue = jsObject->get(exec, propertyIndex);
-    if (jsValue->isUndefined())
-        return 0;
+    if (exec->hadException()) {
+        if (exception)
+            *exception = toRef(exec->exception());
+        exec->clearException();
+    }
     return toRef(jsValue);
 }
 
 
-void JSObjectSetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex, JSValueRef value)
+void JSObjectSetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception)
 {
     JSLock lock;
     ExecState* exec = toJS(context);
@@ -195,6 +196,11 @@ void JSObjectSetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsign
     JSValue* jsValue = toJS(value);
     
     jsObject->put(exec, propertyIndex, jsValue);
+    if (exec->hadException()) {
+        if (exception)
+            *exception = toRef(exec->exception());
+        exec->clearException();
+    }
 }
 
 bool JSObjectDeleteProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)

diff --git a/JavaScriptCore/API/JSObjectRef.h b/JavaScriptCore/API/JSObjectRef.h
index d14fb01096a80ba4dd9c17d892508bb5d6033256..9fa58eb4c93a0a5bb67edcfb47dfe52fec31f99c 100644 (file)
--- a/JavaScriptCore/API/JSObjectRef.h
+++ b/JavaScriptCore/API/JSObjectRef.h
@@ -447,7 +447,7 @@ bool JSObjectHasProperty(JSContextRef context, JSObjectRef object, JSStringRef p
 @param object The JSObject whose property you want to get.
 @param propertyName A JSString containing the property's name.
 @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
-@result The property's value if object has the property, otherwise NULL.
+@result The property's value if object has the property, otherwise the undefined value.
 */
 JSValueRef JSObjectGetProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception);
 
@@ -480,10 +480,11 @@ bool JSObjectDeleteProperty(JSContextRef context, JSObjectRef object, JSStringRe
 @param context The execution context to use.
 @param object The JSObject whose property you want to get.
 @param propertyIndex The property's name as a number
-@result The property's value if object has the property, otherwise NULL.
-@discussion This is equivalent to getting a property by a string name containing the number, but allows faster access to JS arrays.
+@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
+@result The property's value if object has the property, otherwise the undefined value.
+@discussion Calling JSObjectGetPropertyAtIndex is equivalent to calling JSObjectGetProperty with a string containing propertyIndex, but it enables optimized access to JavaScript arrays.
 */
-JSValueRef JSObjectGetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex);
+JSValueRef JSObjectGetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception);
 
 /*!
 @function
@@ -492,9 +493,10 @@ JSValueRef JSObjectGetPropertyAtIndex(JSContextRef context, JSObjectRef object,
 @param object The JSObject whose property you want to set.
 @param propertyIndex The property's name as a number
 @param value A JSValue to use as the property's value.
-@discussion This is equivalent to setting a property by a string name containing the number, but allows faster access to JS arrays.
+@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
+@discussion Calling JSObjectSetPropertyAtIndex is equivalent to calling JSObjectSetProperty with a string containing propertyIndex, but it enables optimized access to JavaScript arrays.
 */
-void JSObjectSetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex, JSValueRef value);
+void JSObjectSetPropertyAtIndex(JSContextRef context, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception);
 
 /*!
 @function

diff --git a/JavaScriptCore/API/testapi.c b/JavaScriptCore/API/testapi.c
index ae853a9aae976aa9c94654550dfb4c5fe450d0f8..8afb6af3b091c709d0fdc18f27e11b38504ee1d2 100644 (file)
--- a/JavaScriptCore/API/testapi.c
+++ b/JavaScriptCore/API/testapi.c
@@ -115,7 +115,8 @@ static bool MyObject_hasProperty(JSContextRef context, JSObjectRef object, JSStr
     if (JSStringIsEqualToUTF8CString(propertyName, "alwaysOne")
         || JSStringIsEqualToUTF8CString(propertyName, "cantFind")
         || JSStringIsEqualToUTF8CString(propertyName, "myPropertyName")
-        || JSStringIsEqualToUTF8CString(propertyName, "hasPropertyLie")) {
+        || JSStringIsEqualToUTF8CString(propertyName, "hasPropertyLie")
+        || JSStringIsEqualToUTF8CString(propertyName, "0")) {
         return true;
     }
     
@@ -139,6 +140,11 @@ static JSValueRef MyObject_getProperty(JSContextRef context, JSObjectRef object,
         return JSValueMakeUndefined();
     }
     
+    if (JSStringIsEqualToUTF8CString(propertyName, "0")) {
+        *exception = JSValueMakeNumber(1);
+        return JSValueMakeNumber(1);
+    }
+    
     return NULL;
 }
 
@@ -414,6 +420,10 @@ int main(int argc, char* argv[])
     exception = NULL;
     assert(!JSValueIsEqual(context, jsObjectNoProto, JSValueMakeNumber(1), &exception));
     assert(exception);
+    
+    exception = NULL;
+    JSObjectGetPropertyAtIndex(context, myObject, 0, &exception);
+    assert(1 == JSValueToNumber(context, exception, NULL));
 
     assertEqualsAsBoolean(jsUndefined, false);
     assertEqualsAsBoolean(jsNull, false);
@@ -524,15 +534,26 @@ int main(int argc, char* argv[])
     assert(JSValueIsObject(exception));
     
     JSStringRef array = JSStringCreateWithUTF8CString("Array");
-    v = JSObjectGetProperty(context, globalObject, array, NULL);
-    assert(v);
-    JSObjectRef arrayConstructor = JSValueToObject(context, v, NULL);
+    JSObjectRef arrayConstructor = JSValueToObject(context, JSObjectGetProperty(context, globalObject, array, NULL), NULL);
     JSStringRelease(array);
     result = JSObjectCallAsConstructor(context, arrayConstructor, 0, NULL, NULL);
     assert(result);
+    assert(JSValueIsObject(result));
     assert(JSValueIsInstanceOfConstructor(context, result, arrayConstructor, NULL));
     assert(!JSValueIsInstanceOfConstructor(context, JSValueMakeNull(), arrayConstructor, NULL));
+
+    o = JSValueToObject(context, result, NULL);
+    exception = NULL;
+    assert(JSValueIsUndefined(JSObjectGetPropertyAtIndex(context, o, 0, &exception)));
+    assert(!exception);
     
+    JSObjectSetPropertyAtIndex(context, o, 0, JSValueMakeNumber(1), &exception);
+    assert(!exception);
+    
+    exception = NULL;
+    assert(1 == JSValueToNumber(context, JSObjectGetPropertyAtIndex(context, o, 0, &exception), &exception));
+    assert(!exception);
+
     JSStringRef functionBody;
     JSObjectRef function;
     
@@ -542,7 +563,6 @@ int main(int argc, char* argv[])
     assert(!JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, &exception));
     assert(JSValueIsObject(exception));
     v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
-    assert(v);
     assertEqualsAsNumber(v, 2); // FIXME: Lexer::setCode bumps startingLineNumber by 1 -- we need to change internal callers so that it doesn't have to (saying '0' to mean '1' in the API would be really confusing -- it's really confusing internally, in fact)
     JSStringRelease(functionBody);
     JSStringRelease(line);
@@ -619,6 +639,8 @@ int main(int argc, char* argv[])
     v = JSObjectCallAsFunction(context, function, o, 0, NULL, NULL);
     assert(JSValueIsEqual(context, v, o, NULL));
     
+    
+    
     char* scriptUTF8 = createStringWithContentsOfFile("testapi.js");
     JSStringRef script = JSStringCreateWithUTF8CString(scriptUTF8);
     result = JSEvaluateScript(context, script, NULL, NULL, 1, &exception);

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 568c762f60b95ecdc0f09d2dfd63a6662101c07e..71655338d3aa90f276459c7b3a82971094f18a59 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2006-07-16  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej.
+        
+        - Change getProperty* to return undefined, rather than NULL, for missing
+        properties, since that's what the spec says. Also added exception out
+        parameters to the *Index functions, because they can call through to the
+        regular functions, which can throw for custom objects.
+
+        * API/JSObjectRef.cpp:
+        (JSObjectGetProperty):
+        (JSObjectGetPropertyAtIndex):
+        (JSObjectSetPropertyAtIndex):
+        * API/JSObjectRef.h:
+        * API/testapi.c:
+        (main):
+
 2006-07-16  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Maciej.