Changeset 15462 for trunk/JavaScriptCore/API/JSClassRef.cpp

Timestamp:

07/15/06 18:28:25 (2 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Moved the arguments passed to JSClassCreate into a single structure, called JSClassDefinition. This will enable easier structure migration/versioning in the future, if necessary.

• Added support for class names.

• kJSClassDefinitionNull replaces kJSObjectCallbacksNone.

• JSClass is becoming a fairly complex struct, so I migrated all of its implementation other than reference counting to the sruct.

• Also moved JSClass* functions in the API to JSObjectRef.cpp, since they're declared in JSObjectRef.h

• Also added some more informative explanation to the class structure doc.

Files:

• trunk/JavaScriptCore/API/JSClassRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -31 +31 @@
 using namespace KJS;
 
-const JSObjectCallbacks kJSObjectCallbacksNone = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+const JSClassDefinition kJSClassDefinitionNull = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-JSClassRef JSClassCreate(JSStaticValue* staticValues, JSStaticFunction* staticFunctions, const JSObjectCallbacks* callbacks, JSClassRef parentClass)
+__JSClass::__JSClass(JSClassDefinition* definition) 
+    : refCount(0)
+    , className(definition->className)
+    , parentClass(definition->parentClass)
+    , staticValues(0)
+    , staticFunctions(0)
+    , initialize(definition->initialize)
+    , finalize(definition->finalize)
+    , hasProperty(definition->hasProperty)
+    , getProperty(definition->getProperty)
+    , setProperty(definition->setProperty)
+    , deleteProperty(definition->deleteProperty)
+    , addPropertiesToList(definition->addPropertiesToList)
+    , callAsFunction(definition->callAsFunction)
+    , callAsConstructor(definition->callAsConstructor)
+    , hasInstance(definition->hasInstance)
+    , convertToType(definition->convertToType)
 {
-    JSClassRef jsClass = new __JSClass;
-    if (staticValues) {
-        jsClass->staticValues = new __JSClass::StaticValuesTable();
-        while (staticValues->name) {
-            jsClass->staticValues->add(Identifier(staticValues->name).ustring().rep(), 
-                                       new StaticValueEntry(staticValues->getProperty, staticValues->setProperty, staticValues->attributes));
-            ++staticValues;
+    if (JSStaticValue* staticValue = definition->staticValues) {
+        staticValues = new StaticValuesTable();
+        while (staticValue->name) {
+            staticValues->add(Identifier(staticValue->name).ustring().rep(), 
+                              new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes));
+            ++staticValue;
         }
     }
     
-    if (staticFunctions) {
-        jsClass->staticFunctions = new __JSClass::StaticFunctionsTable();
-        while (staticFunctions->name) {
-            jsClass->staticFunctions->add(Identifier(staticFunctions->name).ustring().rep(), 
-                                          new StaticFunctionEntry(staticFunctions->callAsFunction, staticFunctions->attributes));
-            ++staticFunctions;
+    if (JSStaticFunction* staticFunction = definition->staticFunctions) {
+        staticFunctions = new StaticFunctionsTable();
+        while (staticFunction->name) {
+            staticFunctions->add(Identifier(staticFunction->name).ustring().rep(), 
+                                 new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes));
+            ++staticFunction;
         }
     }
-    
-    if (callbacks)
-        jsClass->callbacks = *callbacks;
-    else
-        jsClass->callbacks = kJSObjectCallbacksNone;
-    
-    jsClass->parent = parentClass;
-    
-    return JSClassRetain(jsClass);
 }
 
-JSClassRef JSClassRetain(JSClassRef jsClass)
+__JSClass::~__JSClass()
 {
-    ++jsClass->refCount;
-    return jsClass;
-}
+    if (staticValues) {
+        deleteAllValues(*staticValues);
+        delete staticValues;
+    }
 
-void JSClassRelease(JSClassRef jsClass)
-{
-    if (--jsClass->refCount == 0) {
-        if (jsClass->staticValues) {
-            deleteAllValues(*jsClass->staticValues);
-            delete jsClass->staticValues;
-        }
-
-        if (jsClass->staticFunctions) {
-            deleteAllValues(*jsClass->staticFunctions);
-            delete jsClass->staticFunctions;
-        }
-
-        delete jsClass;
+    if (staticFunctions) {
+        deleteAllValues(*staticFunctions);
+        delete staticFunctions;
     }
 }