projects/orange: orange/serialization/Serializer.d annotate

annotate orange/serialization/Serializer.d @ 35:511d1ef4e299 experimental

Now all unit tests pass on latest DMD2 compiler.

author	Jacob Carlborg <doob@me.com>
date	Wed, 03 Aug 2011 21:44:11 +0200
parents	068e853b9c07
children	301476d40518

rev	line source
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1 /**
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	2 * Copyright: Copyright (c) 2010 Jacob Carlborg.
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	3 * Authors: Jacob Carlborg
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	4 * Version: Initial created: Jan 26, 2010
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	5 * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	6 */
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	7 module orange.serialization.Serializer;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	8
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	9 version (Tango)
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 8 diff changeset	10 import tango.util.Convert : to, ConversionException;
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 8 diff changeset	11
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 8 diff changeset	12 else
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	13 {
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 8 diff changeset	14 import std.conv;
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	15 alias ConvException ConversionException;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	16 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	17
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	18 import orange.core._;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	19 import orange.serialization._;
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	20 import orange.serialization.archives.Archive;
068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	21 import orange.serialization.archives.ArchiveException;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	22 import orange.util._;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	23
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	24 private
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	25 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	26 alias orange.util.CTFE.contains ctfeContains;
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	27
9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	28 enum Mode
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	29 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	30 serializing,
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	31 deserializing
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	32 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	33
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	34 alias Mode.serializing serializing;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	35 alias Mode.deserializing deserializing;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	36
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	37 private char toUpper (char c)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	38 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	39 if (c >= 'a' && c <= 'z')
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	40 return cast(char) (c - 32);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	41
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	42 return c;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	43 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	44 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	45
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	46 class Serializer
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	47 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	48 alias void delegate (ArchiveException exception, string[] data) ErrorCallback;
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	49 alias Archive.UntypedData Data;
068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	50 alias Archive.Id Id;
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	51
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	52 private
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	53 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	54 struct ValueMeta
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	55 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	56 Id id;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	57 string key;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	58 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	59
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	60 ErrorCallback errorCallback_;
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	61 Archive archive;
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	62
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	63 size_t keyCounter;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	64 Id idCounter;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	65
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	66 RegisterBase[string] serializers;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	67 RegisterBase[string] deserializers;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	68
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	69 Id[void*] serializedReferences;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	70 void*[Id] deserializedReferences;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	71
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	72 Array[Id] serializedArrays;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	73 void[][Id] deserializedSlices;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	74
31 c68d29967c9f Fixed some bugs in the handling of pointers. Jacob Carlborg <doob@me.com> parents: 30 diff changeset	75 void*[Id] serializedPointers;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	76 void**[Id] deserializedPointers;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	77
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	78 ValueMeta[void*] serializedValues;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	79 void*[Id] deserializedValues;
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	80
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	81 bool hasBegunSerializing;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	82 bool hasBegunDeserializing;
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	83
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	84 void delegate (ArchiveException exception, string[] data) throwOnErrorCallback;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	85 void delegate (ArchiveException exception, string[] data) doNothingOnErrorCallback;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	86 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	87
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	88 this (Archive archive)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	89 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	90 this.archive = archive;
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	91
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	92 throwOnErrorCallback = (ArchiveException exception, string[] data) { throw exception; };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	93 doNothingOnErrorCallback = (ArchiveException exception, string[] data) { /* do nothing */ };
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	94
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	95 setThrowOnErrorCallback();
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	96 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	97
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	98 ErrorCallback errorCallback ()
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	99 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	100 return errorCallback_;
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	101 }
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	102
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	103 ErrorCallback errorCallback (ErrorCallback errorCallback)
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	104 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	105 return errorCallback_ = errorCallback;
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	106 }
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	107
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	108 void setThrowOnErrorCallback ()
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	109 {
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	110 errorCallback = throwOnErrorCallback;
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	111 }
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	112
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	113 void setDoNothingOnErrorCallback ()
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	114 {
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	115 errorCallback = doNothingOnErrorCallback;
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	116 }
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 17 diff changeset	117
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	118 void reset ()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	119 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	120 resetCounters();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	121
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	122 serializers = null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	123 deserializers = null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	124
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	125 serializedReferences = null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	126 deserializedReferences = null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	127
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	128 serializedArrays = null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	129 deserializedSlices = null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	130
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	131 serializedValues = null;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	132 serializedPointers = null;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	133
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	134 hasBegunSerializing = false;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	135 hasBegunDeserializing = false;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	136
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	137 archive.reset;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	138 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	139
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	140 Data serialize (T) (T value, string key = null)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	141 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	142 if (!hasBegunSerializing)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	143 hasBegunSerializing = true;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	144
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	145 serializeInternal(value, key);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	146 postProcess;
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	147
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	148 return archive.untypedData;
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	149 }
9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	150
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	151 private void serializeInternal (T) (T value, string key = null, Id id = Id.max)
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	152 {
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	153 if (!key)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	154 key = nextKey;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	155
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	156 if (id == Id.max)
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	157 id = nextId;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	158
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	159 archive.beginArchiving();
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	160
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	161 static if ( is(T == typedef) )
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	162 serializeTypedef(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	163
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	164 else static if (isObject!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	165 serializeObject(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	166
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	167 else static if (isStruct!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	168 serializeStruct(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	169
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	170 else static if (isString!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	171 serializeString(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	172
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	173 else static if (isArray!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	174 serializeArray(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	175
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	176 else static if (isAssociativeArray!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	177 serializeAssociativeArray(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	178
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	179 else static if (isPrimitive!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	180 serializePrimitive(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	181
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	182 else static if (isPointer!(T))
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	183 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	184 static if (isFunctionPointer!(T))
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	185 goto error;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	186
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	187 else
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	188 serializePointer(value, key, id);
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	189 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	190
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	191 else static if (isEnum!(T))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	192 serializeEnum(value, key, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	193
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	194 else
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	195 {
ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	196 error:
ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	197 throw new SerializationException(format!(`The type "`, T, `" cannot be serialized.`), __FILE__, __LINE__);
ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	198 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	199 }
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	200
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	201 private void serializeObject (T) (T value, string key, Id id)
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	202 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	203 if (!value)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	204 return archive.archiveNull(T.stringof, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	205
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	206 auto reference = getSerializedReference(value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	207
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	208 if (reference != Id.max)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	209 return archive.archiveReference(key, reference);
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	210
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	211 auto runtimeType = value.classinfo.name;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	212
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	213 addSerializedReference(value, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	214
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	215 triggerEvents(serializing, value, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	216 archive.archiveObject(runtimeType, T.stringof, key, id, {
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	217 if (runtimeType in serializers)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	218 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	219 auto wrapper = getSerializerWrapper!(T)(runtimeType);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	220 wrapper(value, this, key);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	221 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	222
17 c4e7e64ffb67 Changed toData/fromData to take an instance of the serializer instead of the archive. Jacob Carlborg <doob@me.com> parents: 16 diff changeset	223 else static if (isSerializable!(T, Serializer))
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	224 value.toData(this, key);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	225
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	226 else
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	227 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	228 if (isBaseClass(value))
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	229 throw new SerializationException(`The object of the static type "` ~ T.stringof ~ `" have a different runtime type (` ~ runtimeType ~ `) and therefore needs to register a serializer for its type "` ~ runtimeType ~ `".`, __FILE__, __LINE__);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	230
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	231 objectStructSerializeHelper(value);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	232 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	233 });
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	234 });
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	235 }
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	236
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	237 private void serializeStruct (T) (T value, string key, Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	238 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	239 string type = T.stringof;
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	240
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	241 triggerEvents(serializing, value, {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	242 archive.archiveStruct(type, key, id, {
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	243 if (type in serializers)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	244 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	245 auto wrapper = getSerializerWrapper!(T)(type);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	246 wrapper(value, this, key);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	247 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	248
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	249 else
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	250 {
17 c4e7e64ffb67 Changed toData/fromData to take an instance of the serializer instead of the archive. Jacob Carlborg <doob@me.com> parents: 16 diff changeset	251 static if (isSerializable!(T, Serializer))
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	252 value.toData(this, key);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	253
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	254 else
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	255 objectStructSerializeHelper(value);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	256 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	257 });
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	258 });
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	259 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	260
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	261 private void serializeString (T) (T value, string key, Id id)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	262 {
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	263 auto array = Array(cast(void*) value.ptr, value.length, ElementTypeOfArray!(T).sizeof);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	264
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	265 archive.archive(value, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	266 addSerializedArray(array, id);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	267 }
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	268
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	269 private void serializeArray (T) (T value, string key, Id id)
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	270 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	271 auto array = Array(value.ptr, value.length, ElementTypeOfArray!(T).sizeof);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	272
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	273 archive.archiveArray(array, arrayToString!(T), key, id, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	274 foreach (i, e ; value)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	275 serializeInternal(e, toData(i));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	276 });
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	277
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	278 addSerializedArray(array, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	279 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	280
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	281 private void serializeAssociativeArray (T) (T value, string key, Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	282 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	283 auto reference = getSerializedReference(value);
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	284
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	285 if (reference != Id.max)
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	286 return archive.archiveReference(key, reference);
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	287
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	288 addSerializedReference(value, id);
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	289
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	290 string keyType = KeyTypeOfAssociativeArray!(T).stringof;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	291 string valueType = ValueTypeOfAssociativeArray!(T).stringof;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	292
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	293 archive.archiveAssociativeArray(keyType, valueType, value.length, key, id, {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	294 size_t i;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	295
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	296 foreach(k, v ; value)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	297 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	298 archive.archiveAssociativeArrayKey(toData(i), {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	299 serializeInternal(k, toData(i));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	300 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	301
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	302 archive.archiveAssociativeArrayValue(toData(i), {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	303 serializeInternal(v, toData(i));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	304 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	305
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	306 i++;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	307 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	308 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	309 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	310
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	311 private void serializePointer (T) (T value, string key, Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	312 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	313 if (!value)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	314 return archive.archiveNull(T.stringof, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	315
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	316 auto reference = getSerializedReference(value);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	317
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	318 if (reference != Id.max)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	319 return archive.archiveReference(key, reference);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	320
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	321 addSerializedReference(value, id);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	322
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	323 archive.archivePointer(key, id, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	324 if (key in serializers)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	325 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	326 auto wrapper = getSerializerWrapper!(T)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	327 wrapper(value, this, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	328 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	329
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	330 else static if (isSerializable!(T, Serializer))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	331 value.toData(this, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	332
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	333 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	334 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	335 static if (isVoid!(BaseTypeOfPointer!(T)))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	336 throw new SerializationException(`The value with the key "` ~ to!(string)(key) ~ `"` ~ format!(` of the type "`, T, `" cannot be serialized on its own, either implement orange.serialization.Serializable.isSerializable or register a serializer.`), __FILE__, __LINE__);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	337
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	338 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	339 serializeInternal(*value, nextKey);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	340 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	341 });
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	342
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	343 addSerializedPointer(value, id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	344 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	345
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	346 private void serializeEnum (T) (T value, string key, Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	347 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	348 alias BaseTypeOfEnum!(T) EnumBaseType;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	349 auto val = cast(EnumBaseType) value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	350 string type = T.stringof;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	351
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	352 archive.archiveEnum(val, type, key, id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	353 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	354
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	355 private void serializePrimitive (T) (T value, string key, Id id)
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	356 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	357 archive.archive(value, key, id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	358 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	359
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	360 private void serializeTypedef (T) (T value, string key, Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	361 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	362 archive.archiveTypedef(T.stringof, key, nextId, {
32 9df3b7a46a51 Updated the unit test with the latest changes. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	363 serializeInternal!(BaseTypeOfTypedef!(T))(value, nextKey);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	364 });
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	365 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	366
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	367 T deserialize (T) (Data data, string key = null)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	368 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	369 if (hasBegunSerializing && !hasBegunDeserializing)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	370 resetCounters();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	371
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	372 if (!hasBegunDeserializing)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	373 hasBegunDeserializing = true;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	374
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	375 if (!key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	376 key = nextKey;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	377
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	378 archive.beginUnarchiving(data);
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	379 auto value = deserializeInternal!(T)(key);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	380 deserializingPostProcess;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	381
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	382 return value;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	383 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	384
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	385 private T deserializeInternal (T, U) (U keyOrId)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	386 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	387 static if (isTypedef!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	388 return deserializeTypedef!(T)(keyOrId);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	389
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	390 else static if (isObject!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	391 return deserializeObject!(T)(keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	392
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	393 else static if (isStruct!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	394 return deserializeStruct!(T)(keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	395
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	396 else static if (isString!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	397 return deserializeString!(T)(keyOrId);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	398
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	399 else static if (isArray!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	400 return deserializeArray!(T)(keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	401
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	402 else static if (isAssociativeArray!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	403 return deserializeAssociativeArray!(T)(keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	404
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	405 else static if (isPrimitive!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	406 return deserializePrimitive!(T)(keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	407
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	408 else static if (isPointer!(T))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	409 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	410 static if (isFunctionPointer!(T))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	411 goto error;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	412 Id id;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	413 return deserializePointer!(T)(keyOrId, id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	414 }
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	415
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	416 else static if (isEnum!(T))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	417 return deserializeEnum!(T)(keyOrId);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	418
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	419 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	420 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	421 error:
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	422 throw new SerializationException(format!(`The type "`, T, `" cannot be deserialized.`), __FILE__, __LINE__);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	423 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	424 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	425
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	426 private T deserializeObject (T, U) (U keyOrId)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	427 {
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	428 auto id = deserializeReference(keyOrId);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	429
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	430 if (auto reference = getDeserializedReference!(T)(id))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	431 return *reference;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	432
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	433 T value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	434 Object val = value;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	435 nextId;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	436
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	437 archive.unarchiveObject(keyOrId, id, val, {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	438 triggerEvents(deserializing, value, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	439 value = cast(T) val;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	440 auto runtimeType = value.classinfo.name;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	441
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	442 if (runtimeType in deserializers)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	443 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	444 auto wrapper = getDeserializerWrapper!(T)(runtimeType);
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	445 wrapper(value, this, keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	446 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	447
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	448 else static if (isSerializable!(T, Serializer))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	449 value.fromData(this, keyOrId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	450
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	451 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	452 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	453 if (isBaseClass(value))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	454 throw new SerializationException(`The object of the static type "` ~ T.stringof ~ `" have a different runtime type (` ~ runtimeType ~ `) and therefore needs to register a deserializer for its type "` ~ runtimeType ~ `".`, __FILE__, __LINE__);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	455
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	456 objectStructDeserializeHelper(value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	457 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	458 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	459 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	460
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	461 addDeserializedReference(value, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	462
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	463 return value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	464 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	465
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	466 private T deserializeStruct (T) (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	467 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	468 T value;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	469 nextId;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	470
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	471 archive.unarchiveStruct(key, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	472 triggerEvents(deserializing, value, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	473 auto type = toData(T.stringof);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	474
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	475 if (type in deserializers)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	476 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	477 auto wrapper = getDeserializerWrapper!(T)(type);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	478 wrapper(value, this, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	479 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	480
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	481 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	482 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	483 static if (isSerializable!(T, Serializer))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	484 value.fromData(this, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	485
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	486 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	487 objectStructDeserializeHelper(value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	488 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	489 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	490 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	491
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	492 return value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	493 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	494
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	495 private T deserializeString (T) (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	496 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	497 auto slice = deserializeSlice(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	498
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	499 if (auto tmp = getDeserializedSlice!(T)(slice))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	500 return *tmp;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	501
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	502 T value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	503
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	504 if (slice.id != size_t.max)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	505 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	506 static if (is(T == string))
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	507 value = toSlice(archive.unarchiveString(slice.id), slice);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	508
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	509 else static if (is(T == wstring))
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	510 value = toSlice(archive.unarchiveWstring(slice.id), slice);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	511
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	512 else static if (is(T == dstring))
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	513 value = toSlice(archive.unarchiveDstring(slice.id), slice);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	514 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	515
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	516 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	517 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	518 static if (is(T == string))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	519 value = archive.unarchiveString(key, slice.id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	520
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	521 else static if (is(T == wstring))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	522 value = archive.unarchiveWstring(key, slice.id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	523
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	524 else static if (is(T == dstring))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	525 value = archive.unarchiveDstring(key, slice.id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	526 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	527
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	528 addDeserializedSlice(value, slice.id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	529
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	530 return value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	531 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	532
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	533 private T deserializeArray (T) (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	534 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	535 auto slice = deserializeSlice(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	536
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	537 if (auto tmp = getDeserializedSlice!(T)(slice))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	538 return *tmp;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	539
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	540 T value;
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	541
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	542 auto dg = (size_t length) {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	543 value.length = length;
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	544
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	545 foreach (i, ref e ; value)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	546 e = deserializeInternal!(typeof(e))(toData(i));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	547 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	548
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	549 if (slice.id != size_t.max)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	550 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	551 archive.unarchiveArray(slice.id, dg);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	552 addDeserializedSlice(value, slice.id);
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	553
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	554 return toSlice(value, slice);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	555 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	556
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	557 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	558 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	559 slice.id = archive.unarchiveArray(key, dg);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	560
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	561 if (auto a = slice.id in deserializedSlices)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	562 return cast(T) *a;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	563
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	564 addDeserializedSlice(value, slice.id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	565
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	566 return value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	567 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	568 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	569
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	570 private T deserializeAssociativeArray (T) (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	571 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	572 auto id = deserializeReference(key);
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	573
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	574 if (auto reference = getDeserializedReference!(T)(id))
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	575 return *reference;
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	576
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	577 T value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	578
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	579 alias KeyTypeOfAssociativeArray!(T) Key;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	580 alias ValueTypeOfAssociativeArray!(T) Value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	581
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	582 id = archive.unarchiveAssociativeArray(key, (size_t length) {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	583 for (size_t i = 0; i < length; i++)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	584 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	585 Key aaKey;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	586 Value aaValue;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	587 auto k = toData(i);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	588
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	589 archive.unarchiveAssociativeArrayKey(k, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	590 aaKey = deserializeInternal!(Key)(k);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	591 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	592
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	593 archive.unarchiveAssociativeArrayValue(k, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	594 aaValue = deserializeInternal!(Value)(k);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	595 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	596
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	597 value[aaKey] = aaValue;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	598 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	599 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	600
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	601 addDeserializedReference(value, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	602
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	603 return value;
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	604 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	605
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	606 private T deserializePointer (T) (string key, out Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	607 {
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	608 id = deserializeReference(key);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	609
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	610 if (auto reference = getDeserializedReference!(T)(id))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	611 return *reference;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	612
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	613 T value = new BaseTypeOfPointer!(T);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	614
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	615 auto pointerId = archive.unarchivePointer(key, {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	616 if (key in deserializers)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	617 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	618 auto wrapper = getDeserializerWrapper!(T)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	619 wrapper(value, this, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	620 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	621
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	622 else static if (isSerializable!(T, Serializer))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	623 value.fromData(this, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	624
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	625 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	626 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	627 static if (isVoid!(BaseTypeOfPointer!(T)))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	628 throw new SerializationException(`The value with the key "` ~ to!(string)(key) ~ `"` ~ format!(` of the type "`, T, `" cannot be deserialized on its own, either implement orange.serialization.Serializable.isSerializable or register a deserializer.`), __FILE__, __LINE__);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	629
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	630 else
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	631 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	632 auto k = nextKey;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	633 id = deserializeReference(k);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	634
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	635 if (id != Id.max)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	636 return;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	637
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	638 *value = deserializeInternal!(BaseTypeOfPointer!(T))(k);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	639 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	640 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	641 });
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	642
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	643 addDeserializedReference(value, pointerId);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	644
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	645 return value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	646 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	647
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	648 private T deserializeEnum (T) (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	649 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	650 alias BaseTypeOfEnum!(T) Enum;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	651
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	652 const functionName = toUpper(Enum.stringof[0]) ~ Enum.stringof[1 .. $];
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	653 mixin("return cast(T) archive.unarchiveEnum" ~ functionName ~ "(key);");
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	654 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	655
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	656 private T deserializePrimitive (T, U) (U keyOrId)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	657 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	658 const functionName = toUpper(T.stringof[0]) ~ T.stringof[1 .. $];
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	659 mixin("return archive.unarchive" ~ functionName ~ "(keyOrId);");
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	660 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	661
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	662 private T deserializeTypedef (T, U) (U keyOrId)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	663 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	664 T value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	665
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	666 archive.unarchiveTypedef!(T)(key, {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	667 value = cast(T) deserializeInternal!(BaseTypeOfTypedef!(T))(nextKey);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	668 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	669
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	670 return value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	671 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	672
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	673 private Id deserializeReference (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	674 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	675 return archive.unarchiveReference(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	676 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	677
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	678 private Slice deserializeSlice (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	679 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	680 return archive.unarchiveSlice(key);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	681 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	682
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	683 private void objectStructSerializeHelper (T) (ref T value)
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	684 {
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	685 static assert(isStruct!(T) \|\| isObject!(T), format!(`The given value of the type "`, T, `" is not a valid type, the only valid types for this method are objects and structs.`));
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	686
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	687 version (Tango)
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	688 const nonSerializedFields = collectAnnotations!(nonSerializedField, T);
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	689
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	690 else
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	691 mixin(`enum nonSerializedFields = collectAnnotations!(nonSerializedField, T);`);
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	692
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	693 foreach (i, dummy ; typeof(T.tupleof))
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	694 {
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	695 version (Tango)
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	696 const field = nameOfFieldAt!(T, i);
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	697
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	698 else
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	699 mixin(`enum field = nameOfFieldAt!(T, i);`);
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	700
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	701 static if (!ctfeContains!(string)(internalFields, field) && !ctfeContains!(string)(nonSerializedFields, field))
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	702 {
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	703 alias typeof(T.tupleof[i]) Type;
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	704 Type v = value.tupleof[i];
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	705 auto id = nextId;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	706
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	707 addSerializedValue(value.tupleof[i], id, toData(keyCounter));
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	708 serializeInternal(v, toData(field), id);
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	709 }
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	710 }
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	711
4 470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	712 static if (isObject!(T) && !is(T == Object))
470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	713 serializeBaseTypes(value);
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	714 }
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	715
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	716 private void objectStructDeserializeHelper (T) (ref T value)
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	717 {
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	718 static assert(isStruct!(T) \|\| isObject!(T), format!(`The given value of the type "`, T, `" is not a valid type, the only valid types for this method are objects and structs.`));
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	719
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	720 version (Tango)
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	721 const nonSerializedFields = collectAnnotations!(nonSerializedField, T);
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	722
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	723 else
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	724 mixin(`enum nonSerializedFields = collectAnnotations!(nonSerializedField, T);`);
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	725
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	726 foreach (i, dummy ; typeof(T.tupleof))
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	727 {
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	728 version (Tango)
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	729 const field = nameOfFieldAt!(T, i);
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	730
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	731 else
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	732 mixin(`enum field = nameOfFieldAt!(T, i);`);
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	733
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	734 static if (!ctfeContains!(string)(internalFields, field) && !ctfeContains!(string)(nonSerializedFields, field))
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	735 {
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	736 alias TypeOfField!(T, field) Type;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	737
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	738 static if (isPointer!(Type))
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	739 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	740 Id id;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	741 value.tupleof[i] = deserializePointer!(Type)(toData(field), id);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	742 addDeserializedPointer(value.tupleof[i], id);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	743 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	744
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	745 else
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	746 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	747 auto fieldValue = deserializeInternal!(Type)(toData(field));
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	748 value.tupleof[i] = fieldValue;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	749 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	750
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	751 addDeserializedValue(value.tupleof[i], nextId);
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	752 }
3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	753 }
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	754
4 470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	755 static if (isObject!(T) && !is(T == Object))
470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	756 deserializeBaseTypes(value);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	757 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	758
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	759 private void serializeBaseTypes (T : Object) (T value)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	760 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	761 alias BaseTypeTupleOf!(T)[0] Base;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	762
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	763 static if (!is(Base == Object))
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	764 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	765 archive.archiveBaseClass(Base.stringof, nextKey, nextId);
4 470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	766 Base base = value;
470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	767 objectStructSerializeHelper(base);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	768 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	769 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	770
2 ea37a9470e3e Fixed multiple NonSerialized Jacob Carlborg <doob@me.com> parents: 0 diff changeset	771 private void deserializeBaseTypes (T : Object) (T value)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	772 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	773 alias BaseTypeTupleOf!(T)[0] Base;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	774
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	775 static if (!is(Base == Object))
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	776 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	777 archive.unarchiveBaseClass!(Base)(nextKey);
4 470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	778 Base base = value;
470ab5270d0c Simplified the implementation of RegisterWrapper. Fixed: the base class of an object was not serialized Jacob Carlborg <doob@me.com> parents: 3 diff changeset	779 objectStructDeserializeHelper(base);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	780 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	781 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	782
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	783 private void addSerializedReference (T) (T value, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	784 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	785 static assert(isReference!(T) \|\| isAssociativeArray!(T), format!(`The given type "`, T, `" is not a reference type, i.e. object, pointer or associative array.`));
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	786
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	787 serializedReferences[cast(void*) value] = id;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	788 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	789
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	790 private void addDeserializedReference (T) (T value, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	791 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	792 static assert(isReference!(T) \|\| isAssociativeArray!(T), format!(`The given type "`, T, `" is not a reference type, i.e. object, pointer or associative array.`));
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	793
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	794 deserializedReferences[id] = cast(void*) value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	795 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	796
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	797 private void addDeserializedSlice (T) (T value, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	798 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	799 static assert(isArray!(T) \|\| isString!(T), format!(`The given type "`, T, `" is not a slice type, i.e. array or string.`));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	800
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	801 deserializedSlices[id] = cast(void[]) value;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	802 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	803
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	804 private void addSerializedValue (T) (ref T value, Id id, string key)
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	805 {
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	806 serializedValues[&value] = ValueMeta(id, key);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	807 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	808
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	809 private void addDeserializedValue (T) (ref T value, Id id)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	810 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	811 deserializedValues[id] = &value;
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	812 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	813
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	814 private void addSerializedPointer (T) (T value, Id id)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	815 {
31 c68d29967c9f Fixed some bugs in the handling of pointers. Jacob Carlborg <doob@me.com> parents: 30 diff changeset	816 serializedPointers[id] = value;
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	817 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	818
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	819 private void addDeserializedPointer (T) (ref T value, Id id)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	820 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	821 deserializedPointers[id] = cast(void**) &value;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	822 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	823
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	824 private Id getSerializedReference (T) (T value)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	825 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	826 if (auto tmp = cast(void*) value in serializedReferences)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	827 return *tmp;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	828
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	829 return Id.max;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	830 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	831
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	832 private T* getDeserializedReference (T) (Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	833 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	834 if (auto reference = id in deserializedReferences)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	835 return cast(T*) reference;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	836
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	837 return null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	838 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	839
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	840 private T* getDeserializedSlice (T) (Slice slice)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	841 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	842 if (auto array = slice.id in deserializedSlices)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	843 return &(cast(T) *array)[slice.offset .. slice.offset + slice.length]; // dereference the array, cast it to the right type,
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	844 // slice it and then return a pointer to the result
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	845 return null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	846 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	847
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	848 private T* getDeserializedArray (T) (Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	849 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	850 if (auto array = id in deserializedSlices)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	851 return cast(T*) array;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	852 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	853
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	854 private T* getDeserializedValue (T) (Id id)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	855 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	856 if (auto value = id in deserializedValues)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	857 return cast(T*) value;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	858
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	859 return null;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	860 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	861
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	862 private T[] toSlice (T) (T[] array, Slice slice)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	863 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	864 return array[slice.offset .. slice.offset + slice.length];
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	865 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	866
15 9f6064f9505a Changed from archive to serializer in the register wrappers. Jacob Carlborg <doob@me.com> parents: 14 diff changeset	867 private SerializeRegisterWrapper!(T, Serializer) getSerializerWrapper (T) (string type)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	868 {
15 9f6064f9505a Changed from archive to serializer in the register wrappers. Jacob Carlborg <doob@me.com> parents: 14 diff changeset	869 auto wrapper = cast(SerializeRegisterWrapper!(T, Serializer)) serializers[type];
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	870
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	871 if (wrapper)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	872 return wrapper;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	873
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	874 assert(false, "throw exception here");
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	875 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	876
15 9f6064f9505a Changed from archive to serializer in the register wrappers. Jacob Carlborg <doob@me.com> parents: 14 diff changeset	877 private DeserializeRegisterWrapper!(T, Serializer) getDeserializerWrapper (T) (string type)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	878 {
15 9f6064f9505a Changed from archive to serializer in the register wrappers. Jacob Carlborg <doob@me.com> parents: 14 diff changeset	879 auto wrapper = cast(DeserializeRegisterWrapper!(T, Serializer)) deserializers[type];
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	880
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	881 if (wrapper)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	882 return wrapper;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	883
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	884 assert(false, "throw exception here");
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	885 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	886
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	887 private SerializeRegisterWrapper!(T, Serializer) toSerializeRegisterWrapper (T) (void delegate (T, Serializer, string) dg)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	888 {
16 091ff1b263db Missed some in the previous commit. Jacob Carlborg <doob@me.com> parents: 15 diff changeset	889 return new SerializeRegisterWrapper!(T, Serializer)(dg);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	890 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	891
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	892 private SerializeRegisterWrapper!(T, Serializer) toSerializeRegisterWrapper (T) (void function (T, Serializer, string) func)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	893 {
16 091ff1b263db Missed some in the previous commit. Jacob Carlborg <doob@me.com> parents: 15 diff changeset	894 return new SerializeRegisterWrapper!(T, Serializer)(func);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	895 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	896
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	897 private DeserializeRegisterWrapper!(T, Serializer) toDeserializeRegisterWrapper (T) (void delegate (ref T, Serializer, string) dg)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	898 {
16 091ff1b263db Missed some in the previous commit. Jacob Carlborg <doob@me.com> parents: 15 diff changeset	899 return new DeserializeRegisterWrapper!(T, Serializer)(dg);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	900 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	901
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	902 private DeserializeRegisterWrapper!(T, Serializer) toDeserializeRegisterWrapper (T) (void function (ref T, Serializer, string) func)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	903 {
16 091ff1b263db Missed some in the previous commit. Jacob Carlborg <doob@me.com> parents: 15 diff changeset	904 return new DeserializeRegisterWrapper!(T, Serializer)(func);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	905 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	906
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	907 private void addSerializedArray (Array array, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	908 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	909 serializedArrays[id] = array;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	910 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	911
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	912 private void postProcess ()
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	913 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	914 postProcessArrays();
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	915 postProcessPointers();
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	916 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	917
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	918 private void postProcessArrays ()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	919 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	920 bool foundSlice = true;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	921
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	922 foreach (sliceKey, slice ; serializedArrays)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	923 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	924 foreach (arrayKey, array ; serializedArrays)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	925 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	926 if (slice.isSliceOf(array) && slice != array)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	927 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	928 auto s = Slice(slice.length, (slice.ptr - array.ptr) / slice.elementSize);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	929 archive.archiveSlice(s, sliceKey, arrayKey);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	930 foundSlice = true;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	931 break;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	932 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	933
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	934 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	935 foundSlice = false;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	936 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	937
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	938 if (!foundSlice)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	939 archive.postProcessArray(sliceKey);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	940 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	941 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	942
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	943 private void postProcessPointers ()
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	944 {
31 c68d29967c9f Fixed some bugs in the handling of pointers. Jacob Carlborg <doob@me.com> parents: 30 diff changeset	945 foreach (pointerId, value ; serializedPointers)
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	946 {
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	947 if (auto valueMeta = value in serializedValues)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	948 archive.archivePointer(valueMeta.id, valueMeta.key, pointerId);
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	949
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	950 else
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	951 archive.postProcessPointer(pointerId);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	952 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	953 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	954
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	955 private void deserializingPostProcess ()
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	956 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	957 deserializingPostProcessPointers;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	958 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	959
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	960 private void deserializingPostProcessPointers ()
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	961 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	962 foreach (pointeeId, pointee ; deserializedValues)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	963 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	964 if (auto pointer = pointeeId in deserializedPointers)
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	965 **pointer = pointee;
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	966 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	967 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	968
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	969 private template arrayToString (T)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	970 {
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	971 version (Tango)
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	972 const arrayToString = ElementTypeOfArray!(T).stringof;
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	973
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	974 else
511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	975 mixin(`enum arrayToString = ElementTypeOfArray!(T).stringof;`);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	976 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	977
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	978 private bool isBaseClass (T) (T value)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	979 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	980 auto name = value.classinfo.name;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	981 auto index = name.lastIndexOf('.');
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	982
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	983 return T.stringof != name[index + 1 .. $];
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	984 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	985
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	986 private Id nextId ()
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	987 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	988 return idCounter++;
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	989 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	990
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	991 private string nextKey ()
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	992 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	993 return toData(keyCounter++);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	994 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	995
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	996 private string prevKey ()
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	997 {
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	998 return toData(--keyCounter);
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	999 }
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 32 diff changeset	1000
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1001 private void resetCounters ()
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1002 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1003 keyCounter = 0;
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	1004 idCounter = 0;
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	1005 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	1006
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1007 private string toData (T) (T value)
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	1008 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 20 diff changeset	1009 return to!(string)(value);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1010 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1011
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1012 private void triggerEvent (string name, T) (T value)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1013 {
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	1014 static assert (isObject!(T) \|\| isStruct!(T), format!(`The given value of the type "`, T, `" is not a valid type, the only valid types for this method are objects and structs.`));
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1015
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1016 foreach (i, dummy ; typeof(T.tupleof))
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1017 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1018 const field = nameOfFieldAt!(T, i);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1019
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1020 static if (field == name)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1021 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1022 alias TypeOfField!(T, field) Type;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1023 auto event = getValueOfField!(T, Type, field)(value);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1024 event(value);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1025 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1026 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1027 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1028
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1029 private void triggerEvents (T) (Mode mode, T value, void delegate () dg)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1030 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1031 if (mode == serializing)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1032 triggerEvent!(onSerializingField)(value);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1033
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1034 else
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1035 triggerEvent!(onDeserializingField)(value);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1036
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1037 dg();
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1038
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1039 if (mode == serializing)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1040 triggerEvent!(onSerializedField)(value);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1041
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1042 else
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1043 triggerEvent!(onDeserializedField)(value);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1044 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1045
8 613a0bb20207 Now works with dmd 1.062 Jacob Carlborg <doob@me.com> parents: 4 diff changeset	1046 private static string[] collectAnnotations (string name, T) ()
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1047 {
3 3c155e4c3d56 Fixed structs Jacob Carlborg <doob@me.com> parents: 2 diff changeset	1048 static assert (isObject!(T) \|\| isStruct!(T), format!(`The given value of the type "`, T, `" is not a valid type, the only valid types for this method are objects and structs.`));
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1049
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1050 string[] annotations;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1051
8 613a0bb20207 Now works with dmd 1.062 Jacob Carlborg <doob@me.com> parents: 4 diff changeset	1052 foreach (i, type ; typeof(T.tupleof))
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1053 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1054 const field = nameOfFieldAt!(T, i);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1055
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1056 static if (field == name)
8 613a0bb20207 Now works with dmd 1.062 Jacob Carlborg <doob@me.com> parents: 4 diff changeset	1057 annotations ~= type.field;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1058 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1059
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1060 return annotations;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1061 }
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 27 diff changeset	1062 }

Mercurial > projects > orange

annotate orange/serialization/Serializer.d @ 35:511d1ef4e299 experimental