Changeset 15469 for trunk/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

07/16/06 15:17:04 (2 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Added names to functions.

• Removed GetPrivate/SetPrivate from callbackFunctions and callbackConstructors. The private data idiom is that a JS object stores its native implementation as private data. For functions and constructors, the native implementation is nothing more than the callback they already store, so supporting private data, too, confuses the idiom. If you *really* want, you can still create a custom function with private data.

• API/JSCallbackConstructor.cpp:
• API/JSCallbackConstructor.h:
• API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::JSCallbackFunction):
• API/JSCallbackFunction.h:
• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::staticFunctionGetter):
• API/JSObjectRef.cpp: (JSObjectMakeFunction): (JSObjectMakeFunctionWithBody): (JSObjectGetPrivate): (JSObjectSetPrivate):
• API/JSObjectRef.h:
• API/minidom.c: (main):
• API/testapi.c: (main):

Files:

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

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -76 +76 @@
 }
 
-JSObjectRef JSObjectMakeFunction(JSContextRef context, JSObjectCallAsFunctionCallback callAsFunction)
-{
-    JSLock lock;
-    ExecState* exec = toJS(context);
-    return toRef(new JSCallbackFunction(exec, callAsFunction));
+JSObjectRef JSObjectMakeFunction(JSContextRef context, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
+{
+    JSLock lock;
+    ExecState* exec = toJS(context);
+    Identifier nameID = name ? Identifier(toJS(name)) : Identifier("anonymous");
+    
+    return toRef(new JSCallbackFunction(exec, callAsFunction, nameID));
 }
 
@@ -95 +97 @@
     
     ExecState* exec = toJS(context);
-    UString::Rep* nameRep = name ? toJS(name) : &UString::Rep::null;
     UString::Rep* bodyRep = toJS(body);
     UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
     
-    Identifier nameIdentifier = nameRep ? Identifier(nameRep) : Identifier("anonymous");
+    Identifier nameID = name ? Identifier(toJS(name)) : Identifier("anonymous");
     
     List args;
@@ -106 +107 @@
     args.append(jsString(UString(bodyRep)));
 
-    JSObject* result = exec->dynamicInterpreter()->builtinFunction()->construct(exec, args, nameIdentifier, UString(sourceURLRep), startingLineNumber);
+    JSObject* result = exec->dynamicInterpreter()->builtinFunction()->construct(exec, args, nameID, UString(sourceURLRep), startingLineNumber);
     if (exec->hadException()) {
         if (exception)
@@ -220 +221 @@
         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;
 }
@@ -238 +233 @@
     }
         
-    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;
 }