Changeset 1318 for branches

Timestamp:

03/09/09 15:33:44 (16 years ago)

Author:

epitzer

Message:

added default constructor that includes all serializers of the persistence assembly. (#506)

Location:

branches/New Persistence Exploration/Persistence/Persistence

Files:

• DeSerializer.cs (modified) (3 diffs)
• NewSerializationTest.cs (modified) (2 diffs)
• Serializer.cs (modified) (2 diffs)
• Util.cs (modified) (1 diff)

branches/New Persistence Exploration/Persistence/Persistence/DeSerializer.cs

@@ -67 +67 @@
     private List<Thunk> finalFixes;
 
+    public DeSerializer() : this(
+      InterfaceInstantiatior.InstantiateAll<IPrimitiveSerializer>(),
+      InterfaceInstantiatior.InstantiateAll<ICompoundSerializer>()) {}    
+
     public DeSerializer(
         IEnumerable<IPrimitiveSerializer> primitiveSerializers,
@@ -83 +87 @@
       }
       this.customSerializers = new List<ICompoundSerializer>(customSerializers);
-      this.finalFixes = new List<Thunk>();
     }
 
     public object DeSerialize(IEnumerable<IParseToken> tokens) {
+      this.finalFixes = new List<Thunk>();
       foreach (IParseToken token in tokens) {
         handlers[token.GetType()].Invoke(token);
@@ -95 +99 @@
       return compositeStack.Pop().Obj;
     }
+
     private void CompositeStartHandler(IParseToken token) {
       CompositeStart start = (CompositeStart)token;

branches/New Persistence Exploration/Persistence/Persistence/NewSerializationTest.cs

@@ -53 +53 @@
       r.dict.Add("two", 2);
       r.dict.Add("three", 3);
-
-      Serializer s = new Serializer(r,
-        new IPrimitiveSerializer[] {
-          new String2XMLSerializer(),
-          new Int2XMLSerializer(),
-          new Double2XmlSerializer(),
-          new Boolean2XmlSerializer(),
-          new DateTime2XmlSerializer(),
-        }, new ICompoundSerializer[] {
-          new EnumerableSerializer(),
-          new ArraySerializer(),
-          new KeyValuePair2XmlSerializer(),
-          new Dictionary2XmlSerializer(),
-        });      
+      Serializer s = new Serializer(r);        
       Persistence.XmlFormatter xmlFormatter = new Persistence.XmlFormatter();
       StreamWriter writer = new StreamWriter("test.xml");
@@ -76 +63 @@
       writer.Close();
       XmlParser parser = new XmlParser(new StreamReader("test.xml"));
-      DeSerializer deSerializer = new DeSerializer(
-        new IPrimitiveSerializer[] { 
-          new Int2XMLSerializer(),
-          new String2XMLSerializer(),
-          new Double2XmlSerializer(),
-          new Boolean2XmlSerializer(),
-          new DateTime2XmlSerializer(),
-        },
-        new ICompoundSerializer[] { 
-          new ArraySerializer(),
-          new EnumerableSerializer(),
-          new KeyValuePair2XmlSerializer(),
-          new Dictionary2XmlSerializer(),
-        });      
+      DeSerializer deSerializer = new DeSerializer();        
       object o = deSerializer.DeSerialize(parser);
       Console.Out.WriteLine(Util.AutoFormat(o, true));

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

@@ -2 +2 @@
 using System.Collections;
 using System;
+using System.Reflection;
 
 namespace Persistence {
@@ -12 +13 @@
     private Dictionary<Type, IPrimitiveSerializer> primitiveSerializers;
     private List<ICompoundSerializer> compoundSerializers;
+
+    public Serializer(object obj) :
+      this(obj,
+      InterfaceInstantiatior.InstantiateAll<IPrimitiveSerializer>(),
+      InterfaceInstantiatior.InstantiateAll<ICompoundSerializer>()) {}
 
     public Serializer(object obj,

branches/New Persistence Exploration/Persistence/Persistence/Util.cs

@@ -5 +5 @@
 
 namespace Persistence {
+  public class InterfaceInstantiatior {
+    public static List<T> InstantiateAll<T>() {
+      return InstantiateAll<T>(Assembly.GetExecutingAssembly());
+    }
+    public static List<T> InstantiateAll<T>(Assembly a) {
+      List<T> instances = new List<T>();
+      foreach (Type t in a.GetTypes()) {
+        if (t.GetInterface(typeof(T).FullName) != null) {
+          ConstructorInfo ci = t.GetConstructor(new Type[] { });
+          if (ci != null) {
+            instances.Add((T)ci.Invoke(new object[] { }));
+          }
+        }
+      }
+      return instances;
+    }
+  }
   public class Util {
     public static string AutoFormat(object o) {