Changeset 15235 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 8, 2006, 11:08:34 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Anders.

• Make JSObjectGetProperty return a JSValue or NULL, like JSEvaluate does.

• API/JSObjectRef.cpp: (JSObjectGetProperty):
• API/JSObjectRef.h:
• API/testapi.c: (main):

Location:

trunk/JavaScriptCore

Files:

• API/JSObjectRef.cpp (modified) (2 diffs)
• API/JSObjectRef.h (modified) (1 diff)
• API/testapi.c (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -128 +128 @@
 }
 
-bool JSObjectGetProperty(JSContextRef context, JSObjectRef object, JSStringBufferRef propertyName, JSValueRef* value)
+JSValueRef JSObjectGetProperty(JSContextRef context, JSObjectRef object, JSStringBufferRef propertyName)
 {
     JSLock lock;
@@ -136 +136 @@
 
     JSValue* jsValue = jsObject->get(exec, Identifier(nameRep));
-    if (value)
-        *value = toRef(jsValue);
-    return !jsValue->isUndefined();
+    if (jsValue->isUndefined())
+        return 0;
+    return jsValue;
 }
 

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -387 +387 @@
 @param object The JSObject whose property you want to get.
 @param propertyName A JSStringBuffer containing the property's name.
-@param value A pointer to a JSValueRef in which to store the property's value. On return, value will contain the property's value. Pass NULL if you do not care to store the property's value.
-@result true if the object has a property whose name matches propertyName, otherwise false. If this function returns false, the contents of value will be unmodified.
-*/
-bool JSObjectGetProperty(JSContextRef context, JSObjectRef object, JSStringBufferRef propertyName, JSValueRef* value);
+@result The property's value, or NULL if the object does not have a property whose name matches propertyName.
+*/
+JSValueRef JSObjectGetProperty(JSContextRef context, JSObjectRef object, JSStringBufferRef propertyName);
 /*!
 @function

trunk/JavaScriptCore/API/testapi.c

@@ -536 +536 @@
     JSStringBufferRelease(badSyntaxBuf);
 
-    v = NULL;
     JSStringBufferRef arrayBuf = JSStringBufferCreateUTF8("Array");
-    assert(JSObjectGetProperty(context, globalObject, arrayBuf, &v));
+    v = JSObjectGetProperty(context, globalObject, arrayBuf);
+    assert(v);
     JSObjectRef arrayConstructor = JSValueToObject(context, v);
     JSStringBufferRelease(arrayBuf);
@@ -548 +548 @@
     JSStringBufferRef functionBuf;
     
-    v = NULL;
     exception = NULL;
     functionBuf = JSStringBufferCreateUTF8("rreturn Array;");
@@ -554 +553 @@
     assert(!JSFunctionMakeWithBody(context, functionBuf, NULL, 1, &exception));
     assert(JSValueIsObject(exception));
-    assert(JSObjectGetProperty(context, exception, lineBuf, &v));
+    v = JSObjectGetProperty(context, exception, lineBuf);
+    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)
     JSStringBufferRelease(functionBuf);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-08  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Anders.
+        
+        - Make JSObjectGetProperty return a JSValue or NULL, like JSEvaluate does.
+
+        * API/JSObjectRef.cpp:
+        (JSObjectGetProperty):
+        * API/JSObjectRef.h:
+        * API/testapi.c:
+        (main):
+
 2006-07-08  Geoffrey Garen  <[email protected]>