Changeset 15018 for branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default

Timestamp:

06/01/17 11:29:49 (8 years ago)

Author:

gkronber

Message:

#2520 introduced StorableConstructorFlag type for StorableConstructors

Location:

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default

Files:

• CompositeSerializers/ArraySerializer.cs (modified) (1 diff)
• CompositeSerializers/CompactNumberArray2StringSerializer.cs (modified) (1 diff)
• CompositeSerializers/ConcreteDictionarySerializer.cs (modified) (1 diff)
• CompositeSerializers/DictionarySerializer.cs (modified) (1 diff)
• CompositeSerializers/EnumSerializer.cs (modified) (1 diff)
• CompositeSerializers/EnumerableSerializer.cs (modified) (1 diff)
• CompositeSerializers/HashSetSerializer.cs (modified) (1 diff)
• CompositeSerializers/KeyValuePairSerializer.cs (modified) (1 diff)
• CompositeSerializers/Number2StringSerializer.cs (modified) (1 diff)
• CompositeSerializers/NumberEnumerable2StringSerializer.cs (modified) (1 diff)
• CompositeSerializers/QueueSerializer.cs (modified) (1 diff)
• CompositeSerializers/StackSerializer.cs (modified) (1 diff)
• CompositeSerializers/Storable/StorableSerializer.cs (modified) (2 diffs)
• CompositeSerializers/StructSerializer.cs (modified) (1 diff)
• CompositeSerializers/TupleSerializer.cs (modified) (1 diff)
• CompositeSerializers/TypeSerializer.cs (modified) (1 diff)
• DebugString/DebugString.cs (modified) (1 diff)
• DebugString/DebugStringFormat.cs (modified) (1 diff)
• Xml/XmlFormat.cs (modified) (1 diff)
• Xml/XmlString.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs

@@ -32 +32 @@
 
     [StorableConstructor]
-    private ArraySerializer(bool deserializing) { }
+    private ArraySerializer(StorableConstructorFlag deserializing) { }
     public ArraySerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs

@@ -82 +82 @@
 
     [StorableConstructor]
-    private CompactNumberArray2StringSerializer(bool deserializing) { }
+    private CompactNumberArray2StringSerializer(StorableConstructorFlag deserializing) { }
     public CompactNumberArray2StringSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ConcreteDictionarySerializer.cs

@@ -34 +34 @@
 
     [StorableConstructor]
-    private ConcreteDictionarySerializer(bool deserializing) { }
+    private ConcreteDictionarySerializer(StorableConstructorFlag deserializing) { }
     public ConcreteDictionarySerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs

@@ -34 +34 @@
 
     [StorableConstructor]
-    private DictionarySerializer(bool deserializing) { }
+    private DictionarySerializer(StorableConstructorFlag deserializing) { }
     public DictionarySerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs

@@ -32 +32 @@
 
     [StorableConstructor]
-    private EnumSerializer(bool deserializing) { }
+    private EnumSerializer(StorableConstructorFlag deserializing) { }
     public EnumSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs

@@ -35 +35 @@
 
     [StorableConstructor]
-    private EnumerableSerializer(bool deserializing) { }
+    private EnumerableSerializer(StorableConstructorFlag deserializing) { }
     public EnumerableSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/HashSetSerializer.cs

@@ -35 +35 @@
 
     [StorableConstructor]
-    private HashSetSerializer(bool deserializing) { }
+    private HashSetSerializer(StorableConstructorFlag deserializing) { }
     public HashSetSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs

@@ -34 +34 @@
 
     [StorableConstructor]
-    private KeyValuePairSerializer(bool deserializing) { }
+    private KeyValuePairSerializer(StorableConstructorFlag deserializing) { }
     public KeyValuePairSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

@@ -44 +44 @@
 
     [StorableConstructor]
-    private Number2StringSerializer(bool deserializing) { }
+    private Number2StringSerializer(StorableConstructorFlag deserializing) { }
     public Number2StringSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

@@ -35 +35 @@
 
     [StorableConstructor]
-    private NumberEnumerable2StringSerializer(bool deserializing) { }
+    private NumberEnumerable2StringSerializer(StorableConstructorFlag deserializing) { }
     public NumberEnumerable2StringSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/QueueSerializer.cs

@@ -34 +34 @@
 
     [StorableConstructor]
-    private QueueSerializer(bool deserializing) { }
+    private QueueSerializer(StorableConstructorFlag deserializing) { }
     public QueueSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs

@@ -34 +34 @@
 
     [StorableConstructor]
-    private StackSerializer(bool deserializing) { }
+    private StackSerializer(StorableConstructorFlag deserializing) { }
     public StackSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -50 +50 @@
 
     [StorableConstructor]
-    private StorableSerializer(bool deserializing) : this() { }
+    private StorableSerializer(StorableConstructorFlag deserializing) : this() { }
 
     #region ICompositeSerializer implementation
@@ -241 +241 @@
         .Where(ci => ci.GetCustomAttributes(typeof(StorableConstructorAttribute), false).Length > 0)) {
         if (ci.GetParameters().Length != 1 ||
-            ci.GetParameters()[0].ParameterType != typeof(bool))
-          throw new PersistenceException("StorableConstructor must have exactly one argument of type bool");
+            ci.GetParameters()[0].ParameterType != typeof(StorableConstructorFlag))
+          throw new PersistenceException("StorableConstructor must have exactly one argument of type StorableConstructorFlag");
         var dm = new DynamicMethod("", typeof(object), null, type, true);
         var ilgen = dm.GetILGenerator();
-        ilgen.Emit(OpCodes.Ldc_I4_1); // load true
+        var local = ilgen.DeclareLocal(typeof(StorableConstructorFlag));
+        ilgen.Emit(OpCodes.Ldloca_S, local);
+        ilgen.Emit(OpCodes.Initobj,typeof(StorableConstructorFlag)); // load default value for StorableConstructorFlag
+        ilgen.Emit(OpCodes.Ldloc_0);
         ilgen.Emit(OpCodes.Newobj, ci);
         ilgen.Emit(OpCodes.Ret);

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs

@@ -33 +33 @@
 
     [StorableConstructor]
-    private StructSerializer(bool deserializing) { }
+    private StructSerializer(StorableConstructorFlag deserializing) { }
     public StructSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs

@@ -34 +34 @@
 
     [StorableConstructor]
-    private TupleSerializer(bool deserializing) { }
+    private TupleSerializer(StorableConstructorFlag deserializing) { }
     public TupleSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

@@ -33 +33 @@
 
     [StorableConstructor]
-    private TypeSerializer(bool deserializing) { }
+    private TypeSerializer(StorableConstructorFlag deserializing) { }
     public TypeSerializer() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/DebugString/DebugString.cs

@@ -39 +39 @@
 
     [StorableConstructor]
-    protected DebugString(bool deserializing) { }
+    protected DebugString(StorableConstructorFlag deserializing) { }
     private DebugString() { }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/DebugString/DebugStringFormat.cs

@@ -37 +37 @@
 
     [StorableConstructor]
-    protected DebugStringFormat(bool deserializing) : base(deserializing) { }
+    protected DebugStringFormat(StorableConstructorFlag deserializing) : base(deserializing) { }
     public DebugStringFormat() { }
   }

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

@@ -38 +38 @@
 
     [StorableConstructor]
-    protected XmlFormat(bool deserializing) : base(deserializing) { }
+    protected XmlFormat(StorableConstructorFlag deserializing) : base(deserializing) { }
     public XmlFormat() { }
   }

branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

@@ -41 +41 @@
 
     [StorableConstructor]
-    protected XmlString(bool deserializing) { }
+    protected XmlString(StorableConstructorFlag deserializing) { }
     private XmlString() { }