Changeset 1339 for branches/New Persistence Exploration/Persistence/Persistence/Serializer.cs

Timestamp:

03/13/09 10:58:33 (15 years ago)

Author:

epitzer

Message:

support composite value types (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/Serializer.cs (modified) (3 diffs)

branches/New Persistence Exploration/Persistence/Persistence/Serializer.cs

@@ -12 +12 @@
     private readonly Dictionary<Type, IPrimitiveSerializer> primitiveSerializers;
     private readonly List<ICompoundSerializer> compoundSerializers;
+    private readonly Dictionary<Type, int> typeCache;
 
     public Serializer(object obj) :
@@ -34 +35 @@
       this.compoundSerializers = new List<ICompoundSerializer>(compoundSerializers);
       obj2id = new Dictionary<object, int> {{new object(), 0}};
-        }
+      typeCache = new Dictionary<Type, int>();
+    }
 
     IEnumerator IEnumerable.GetEnumerator() {
@@ -46 +48 @@
       while (iterator.MoveNext())
         yield return iterator.Current;
+      Console.WriteLine("TypeCache:f");
+      foreach ( var pair in typeCache )
+        Console.WriteLine(pair.Key);
     }
 
     private IEnumerator<ISerializationToken> Serialize(DataMemberAccessor accessor) {
+
       object value = accessor.Get();
+
       if (value == null) {
         yield return new NullReferenceToken(accessor.Name);
-      } else if (obj2id.ContainsKey(value)) {
+        yield break;
+      }
+
+      if (obj2id.ContainsKey(value)) {
         yield return new ReferenceToken(accessor.Name, obj2id[value]);
-      } else if (primitiveSerializers.ContainsKey(value.GetType())) {
-        int? id = null;
-        if ( ! value.GetType().IsValueType ) {
-          id = obj2id.Count;
-          obj2id.Add(value, (int)id);
-        }
+        yield break;
+      }
+
+      if ( ! typeCache.ContainsKey(value.GetType()))
+        typeCache.Add(value.GetType(), typeCache.Count);
+
+      int? id = null;
+      if ( ! value.GetType().IsValueType) {
+        id = obj2id.Count;
+        obj2id.Add(value, (int)id);
+      }
+
+      if (primitiveSerializers.ContainsKey(value.GetType())) {
+        
         yield return new PrimitiveToken(
           accessor,
           primitiveSerializers[value.GetType()].Serialize(value),
-          id);      
-      } else {
-        int id = obj2id.Count;
-        obj2id.Add(value, id);
-        yield return new BeginToken(accessor, id);
-        ICompoundSerializer customSerializer = FindCompoundSerializer(value.GetType());
-        if (customSerializer != null) {
-          foreach (object o in customSerializer.Serialize(value)) {
-            IEnumerator<ISerializationToken> iterator = Serialize(new DataMemberAccessor(o));
-            while (iterator.MoveNext())
-              yield return iterator.Current;
-          }
-        } else { // composite serialization
-          int nSubComponents = 0;
-          foreach (KeyValuePair<string, DataMemberAccessor> mapping in
-            StorableAttribute.GetAutostorableAccessors(value)) {
-            nSubComponents += 1;
-            IEnumerator<ISerializationToken> iterator = Serialize(mapping.Value);                        
-            while (iterator.MoveNext()) {                            
-              yield return iterator.Current;
-            }                        
-          }
-          if (nSubComponents == 0) {
-            throw new ApplicationException(String.Format(
-              "Composite value of type \"{0}\" contains no subcomponents",
-              value.GetType().FullName));
-          }
+          id);
+        yield break;
+      }
+      
+      yield return new BeginToken(accessor, id);
+      ICompoundSerializer customSerializer = FindCompoundSerializer(value.GetType());
+
+      if (customSerializer != null) {
+        foreach (object o in customSerializer.Serialize(value)) {
+          IEnumerator<ISerializationToken> iterator = Serialize(new DataMemberAccessor(o));
+          while (iterator.MoveNext())
+            yield return iterator.Current;
         }
         yield return new EndToken(accessor, id);
+        yield break;
       }
+
+      int nSubComponents = 0;
+      foreach (KeyValuePair<string, DataMemberAccessor> mapping in
+        StorableAttribute.GetAutostorableAccessors(value)) {
+        nSubComponents += 1;
+        IEnumerator<ISerializationToken> iterator = Serialize(mapping.Value);
+        while (iterator.MoveNext()) {
+          yield return iterator.Current;
+        }
+      }
+      if (nSubComponents == 0) {
+        throw new ApplicationException(String.Format(
+                                         "Composite value of type \"{0}\" contains no subcomponents",
+                                         value.GetType().FullName));
+      }
+      yield return new EndToken(accessor, id);
     }