wip II

[sdk] / ecere / src / com / containers / Map.ec

diff --git a/ecere/src/com/containers/Map.ec b/ecere/src/com/containers/Map.ec
index 622c1d3..8766074 100644 (file)
--- a/ecere/src/com/containers/Map.ec
+++ b/ecere/src/com/containers/Map.ec
@@ -6,6 +6,8 @@ import "CustomAVLTree"
 default:
 extern int __ecereVMethodID_class_OnCopy;
 extern int __ecereVMethodID_class_OnFree;
+extern int __ecereVMethodID_class_OnSerialize;
+extern int __ecereVMethodID_class_OnUnserialize;
 private:
 
 public class MapNode<class KT, class V> : private AVLNode<KT>
@@ -104,7 +106,7 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
          {
             Class Tclass = class(MT);
             // Copy key here
-            if(Tclass.type == systemClass || Tclass.type == bitClass || Tclass.type == enumClass || Tclass.type == unitClass)
+            if((Tclass.type == systemClass && !Tclass.byValueSystemClass) || Tclass.type == bitClass || Tclass.type == enumClass || Tclass.type == unitClass)
             {
                ((void (*)(void *, void *, void *))(void *)Tclass._vTbl[__ecereVMethodID_class_OnCopy])(Tclass, (((byte *)&(uint64)newNode.key) + __ENDIAN_PAD(Tclass.typeSize)),
                   (((byte *)&(uint64)newNode.key) + __ENDIAN_PAD(Tclass.typeSize)));
@@ -142,14 +144,27 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
       MapNode<MT, V> node;
       while(node = root)
       {
-         delete node.value;
+         MapNode<MT, V> n = node;
+
+         // Adjust node pointer for non-standard AVLNode
+         if(class(MT).type == structClass)
+            n = (MapNode<MT, V>)(((byte *) node) + class(MT).structSize - sizeof(node.AVLNode::key));
+
+         delete n.value;
          Remove(node);
       }
    }
 
    void Delete(MapNode<MT, V> node)
    {
-      delete node.value;
+      MapNode<MT, V> n = node;
+
+      // Adjust node pointer for non-standard AVLNode
+      if(class(MT).type == structClass)
+         n = (MapNode<MT, V>)(((byte *) node) + class(MT).structSize - sizeof(node.AVLNode::key));
+
+      delete n.value;
+
       Remove(node);
    }
 
@@ -176,7 +191,7 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
          {
             node = MapNode<MT, V> { key = pos };
          }
-         if(Tclass.type == systemClass || Tclass.type == bitClass || Tclass.type == enumClass || Tclass.type == unitClass)
+         if((Tclass.type == systemClass && !Tclass.byValueSystemClass) || Tclass.type == bitClass || Tclass.type == enumClass || Tclass.type == unitClass)
          {
             ((void (*)(void *, void *, void *))(void *)Tclass._vTbl[__ecereVMethodID_class_OnCopy])(Tclass, (((byte *)&(uint64)node.key) + __ENDIAN_PAD(Tclass.typeSize)),
               (((byte *)&(uint64)pos) + __ENDIAN_PAD(Tclass.typeSize)));
@@ -223,4 +238,51 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
          }
       }
    }
+
+   void OnSerialize(IOChannel channel)
+   {
+      uint count = GetCount();
+      IteratorPointer i;
+      Class Kclass = class(MT);
+      Class Dclass = class(V);
+      bool kIsNormalClass = Kclass.type == normalClass;
+      bool dIsNormalClass = Dclass.type == normalClass;
+
+      channel.Put(count);
+      for(i = GetFirst(); i; i = GetNext(i))
+      {
+         MapNode<MT, V> srcNode = (MapNode<MT, V>)i;
+         MT key = GetKey((MapNode<KT, V>)srcNode);
+         D data = GetData(srcNode);
+         Class kEclass = dIsNormalClass ? ((Instance)key)._class : Kclass;
+         Class dEclass = dIsNormalClass ? ((Instance)data)._class : Dclass;
+
+         ((void (*)(void *, void *, void *))(void *)kEclass._vTbl[__ecereVMethodID_class_OnSerialize])(kEclass,
+            ((Kclass.type == systemClass && !Kclass.byValueSystemClass) || Kclass.type == bitClass || Kclass.type == enumClass || Kclass.type == unitClass) ? &key : (void *)key, channel);
+         ((void (*)(void *, void *, void *))(void *)dEclass._vTbl[__ecereVMethodID_class_OnSerialize])(dEclass,
+            ((Dclass.type == systemClass && !Dclass.byValueSystemClass) || Dclass.type == bitClass || Dclass.type == enumClass || Dclass.type == unitClass) ? &data : (void *)data, channel);
+      }
+   }
+
+   void OnUnserialize(IOChannel channel)
+   {
+      uint c, count;
+      thisclass container = eInstance_New(_class.fullName);
+      IteratorPointer i;
+      Class Kclass = class(MT);
+      Class Dclass = class(V);
+
+      channel.Get(count);
+      for(c = 0; c < count; c++)
+      {
+         MapNode<MT, V> destNode;
+         MT key;
+         D data;
+         ((void (*)(void *, void *, void *))(void *)Kclass._vTbl[__ecereVMethodID_class_OnUnserialize])(Kclass, &key, channel);
+         ((void (*)(void *, void *, void *))(void *)Dclass._vTbl[__ecereVMethodID_class_OnUnserialize])(Dclass, &data, channel);
+         destNode = (MapNode<MT, V>)container.GetAtPosition(key, true);
+         container.SetData(destNode, data);
+      }
+      this = container;
+   }
 }