Imported Upstream version 1.0.3upstream/1.0.3

1 files changed, 35 insertions, 24 deletions

diff --git a/Object.c b/Object.c
index 395bd10..2399e50 100644
--- a/Object.c
+++ b/Object.c
@@ -1,51 +1,62 @@
 /*
 htop - Object.c
-(C) 2004-2011 Hisham H. Muhammad
+(C) 2004-2012 Hisham H. Muhammad
 Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
 #include "Object.h"
 
-#include "CRT.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
 /*{
 #include "RichString.h"
 
-#ifndef DEBUG
-#define Object_setClass(obj, class)
-#endif
-
 typedef struct Object_ Object;
 
 typedef void(*Object_Display)(Object*, RichString*);
 typedef int(*Object_Compare)(const void*, const void*);
 typedef void(*Object_Delete)(Object*);
 
+#define Object_getClass(obj_)         ((Object*)(obj_))->klass
+#define Object_setClass(obj_, class_) Object_getClass(obj_) = (ObjectClass*) class_
+
+#define Object_delete(obj_)           Object_getClass(obj_)->delete((Object*)(obj_))
+#define Object_displayFn(obj_)        Object_getClass(obj_)->display
+#define Object_display(obj_, str_)    Object_getClass(obj_)->display((Object*)(obj_), str_)
+#define Object_compare(obj_, other_)  Object_getClass(obj_)->compare((const void*)(obj_), other_)
+
+#define Class(class_)                 ((ObjectClass*)(&(class_ ## _class)))
+
+#define AllocThis(class_) (class_*) malloc(sizeof(class_)); Object_setClass(this, Class(class_));
+ 
+typedef struct ObjectClass_ {
+   const void* extends;
+   const Object_Display display;
+   const Object_Delete delete;
+   const Object_Compare compare;
+} ObjectClass;
+
 struct Object_ {
-   #ifdef DEBUG
-   char* class;
-   #endif
-   Object_Display display;
-   Object_Delete delete;
+   ObjectClass* klass;
 };
-}*/
 
-#ifdef DEBUG
-char* OBJECT_CLASS = "Object";
+}*/
 
-#else
-#define OBJECT_CLASS NULL
-#endif
+ObjectClass Object_class = {
+   .extends = NULL
+};
 
 #ifdef DEBUG
 
-void Object_setClass(void* this, char* class) {
-   ((Object*)this)->class = class;
+bool Object_isA(Object* o, const ObjectClass* klass) {
+   if (!o)
+      return false;
+   const ObjectClass* type = o->klass;
+   while (type) {
+      if (type == klass)
+         return true;
+      type = type->extends;
+   }
+   return false;
 }
 
 #endif