projects/orange: orange/serialization/archives/XMLArchive.d annotate

annotate orange/serialization/archives/XMLArchive.d @ 46:d6fbd0b3586e

Issue 8: Wrong results for array of arrays. (Temporary fix).

author	Jacob Carlborg <doob@me.com>
date	Tue, 09 Aug 2011 11:38:50 +0200
parents	3cd22957e411
children	9c9bbef6bf5e

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.archives.XMLArchive;
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)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	10 import tango.util.Convert : to;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	11
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	12 else
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	13 import std.conv;
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	14
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	15 import orange.core._;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	16 import orange.serialization.archives._;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	17 import orange.serialization.Serializer;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	18 import orange.util._;
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	19 import orange.xml.XMLDocument;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	20
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	21 final class XMLArchive (U = char) : Base!(U)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	22 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	23 private alias Archive.Id Id;
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	24
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	25 private struct Tags
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	26 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	27 static const Data structTag = "struct";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	28 static const Data dataTag = "data";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	29 static const Data archiveTag = "archive";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	30 static const Data arrayTag = "array";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	31 static const Data objectTag = "object";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	32 static const Data baseTag = "base";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	33 static const Data stringTag = "string";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	34 static const Data referenceTag = "reference";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	35 static const Data pointerTag = "pointer";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	36 static const Data associativeArrayTag = "associativeArray";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	37 static const Data typedefTag = "typedef";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	38 static const Data nullTag = "null";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	39 static const Data enumTag = "enum";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	40 static const Data sliceTag = "slice";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	41 static const Data elementTag = "element";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	42 static const Data keyTag = "key";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	43 static const Data valueTag = "value";
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
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	46 private struct Attributes
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	47 {
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	48 static const Data invalidAttribute = "\0";
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	49 static const Data typeAttribute = "type";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	50 static const Data versionAttribute = "version";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	51 static const Data lengthAttribute = "length";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	52 static const Data keyAttribute = "key";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	53 static const Data runtimeTypeAttribute = "runtimeType";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	54 static const Data idAttribute = "id";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	55 static const Data keyTypeAttribute = "keyType";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	56 static const Data valueTypeAttribute = "valueType";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	57 static const Data offsetAttribute = "offset";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	58 static const Data baseTypeAttribute = "baseType";
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	59 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	60
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	61 private struct Node
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	62 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	63 XMLDocument!(U).Node parent;
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	64 XMLDocument!(U).Node node;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	65 Id id;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	66 string key;
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	67 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	68
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	69 private
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	70 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	71 Data archiveType = "org.dsource.orange.xml";
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	72 Data archiveVersion = "1.0.0";
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	73
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	74 XMLDocument!(U) doc;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	75 doc.Node lastElement;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	76
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	77 bool hasBegunArchiving;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	78 bool hasBegunUnarchiving;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	79
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	80 Node[Id] archivedArrays;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	81 Node[Id] archivedPointers;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	82 void[][Data] unarchivedSlices;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	83 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	84
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	85 this (ErrorCallback errorCallback = null)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	86 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	87 super(errorCallback);
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	88 doc = new XMLDocument!(U);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	89 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	90
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	91 public void beginArchiving ()
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	92 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	93 if (!hasBegunArchiving)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	94 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	95 doc.header;
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	96 lastElement = doc.tree.element(Tags.archiveTag)
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	97 .attribute(Attributes.typeAttribute, archiveType)
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	98 .attribute(Attributes.versionAttribute, archiveVersion);
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	99 lastElement = lastElement.element(Tags.dataTag);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	100
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	101 hasBegunArchiving = true;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	102 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	103 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	104
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	105 public void beginUnarchiving (UntypedData untypedData)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	106 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	107 auto data = cast(Data) untypedData;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	108
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	109 if (!hasBegunUnarchiving)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	110 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	111 doc.parse(data);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	112 hasBegunUnarchiving = true;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	113
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	114 auto set = doc.query[Tags.archiveTag][Tags.dataTag];
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	115
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	116 if (set.nodes.length == 1)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	117 lastElement = set.nodes[0];
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	118
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	119 else
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	120 {
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	121 if (errorCallback)
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	122 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	123 auto dataTag = to!(string)(Tags.dataTag);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	124
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	125 if (set.nodes.length == 0)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	126 errorCallback(new ArchiveException(errorMessage!(ArchiveMode.unarchiving) ~ `The "` ~ to!(string)(Tags.dataTag) ~ `" tag could not be found.`, __FILE__, __LINE__), [dataTag]);
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	127
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	128 else
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	129 errorCallback(new ArchiveException(errorMessage!(ArchiveMode.unarchiving) ~ `There were more than one "` ~ to!(string)(Tags.dataTag) ~ `" tag.`, __FILE__, __LINE__), [dataTag]);
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	130 }
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	131 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	132 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	133 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	134
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	135 UntypedData untypedData ()
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	136 {
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	137 return doc.toString();
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	138 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	139
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	140 Data data ()
20 9a575087b961 Added support for slices. Strings and arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 18 diff changeset	141 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	142 return doc.toString;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	143 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	144
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	145 void reset ()
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	146 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	147 hasBegunArchiving = false;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	148 hasBegunUnarchiving = false;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	149 doc.reset;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	150 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	151
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	152 void archiveArray (Array array, string type, string key, Id id, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	153 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	154 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	155 internalArchiveArray(array, type, key, id, Tags.arrayTag);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	156 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	157 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	158 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	159
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	160 private void internalArchiveArray(Array array, string type, string key, Id id, Data tag, Data content = null)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	161 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	162 auto parent = lastElement;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	163
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	164 if (array.length == 0)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	165 lastElement = lastElement.element(tag);
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	166
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	167 else
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	168 lastElement = doc.createNode(tag, content);
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	169
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	170 lastElement.attribute(Attributes.typeAttribute, toData(type))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	171 .attribute(Attributes.lengthAttribute, toData(array.length))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	172 .attribute(Attributes.keyAttribute, toData(key))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	173 .attribute(Attributes.idAttribute, toData(id));
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	174
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	175 addArchivedArray(id, parent, lastElement, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	176 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	177
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	178 void archiveAssociativeArray (string keyType, string valueType, size_t length, string key, Id id, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	179 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	180 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	181 lastElement = lastElement.element(Tags.associativeArrayTag)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	182 .attribute(Attributes.keyTypeAttribute, toData(keyType))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	183 .attribute(Attributes.valueTypeAttribute, toData(valueType))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	184 .attribute(Attributes.lengthAttribute, toData(length))
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	185 .attribute(Attributes.keyAttribute, key)
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	186 .attribute(Attributes.idAttribute, toData(id));
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	187
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	188 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	189 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	190 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	191
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	192 void archiveAssociativeArrayKey (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	193 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	194 internalArchiveAAKeyValue(key, Tags.keyTag, dg);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	195 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	196
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	197 void archiveAssociativeArrayValue (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	198 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	199 internalArchiveAAKeyValue(key, Tags.valueTag, dg);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	200 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	201
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	202 private void internalArchiveAAKeyValue (string key, Data tag, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	203 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	204 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	205 lastElement = lastElement.element(tag)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	206 .attribute(Attributes.keyAttribute, toData(key));
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 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	209 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	210 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	211
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	212 void archiveEnum (bool value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	213 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	214 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	215 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	216
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	217 void archiveEnum (byte value, string type, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	218 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	219 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	220 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	221
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	222 void archiveEnum (char value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	223 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	224 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	225 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	226
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	227 void archiveEnum (dchar value, string type, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	228 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	229 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	230 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	231
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	232 void archiveEnum (int value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	233 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	234 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	235 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	236
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	237 void archiveEnum (long value, string type, string key, Id id)
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 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	240 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	241
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	242 void archiveEnum (short value, string type, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	243 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	244 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	245 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	246
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	247 void archiveEnum (ubyte value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	248 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	249 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	250 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	251
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	252 void archiveEnum (uint value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	253 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	254 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	255 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	256
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	257 void archiveEnum (ulong value, string type, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	258 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	259 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	260 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	261
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	262 void archiveEnum (ushort value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	263 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	264 internalArchiveEnum(value, type, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	265 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	266
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	267 void archiveEnum (wchar value, string type, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	268 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	269 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	270 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	271
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	272 private void internalArchiveEnum (T) (T value, string type, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	273 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	274 lastElement.element(Tags.enumTag, toData(value))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	275 .attribute(Attributes.typeAttribute, toData(type))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	276 .attribute(Attributes.baseTypeAttribute, toData(T.stringof))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	277 .attribute(Attributes.keyAttribute, toData(key))
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	278 .attribute(Attributes.idAttribute, toData(id));
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	279 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	280
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	281 void archiveBaseClass (string type, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	282 {
43 6f35fb47ca24 Added test for serializing subclasses. Jacob Carlborg <doob@me.com> parents: 35 diff changeset	283 lastElement = lastElement.element(Tags.baseTag)
6f35fb47ca24 Added test for serializing subclasses. Jacob Carlborg <doob@me.com> parents: 35 diff changeset	284 .attribute(Attributes.typeAttribute, toData(type))
6f35fb47ca24 Added test for serializing subclasses. Jacob Carlborg <doob@me.com> parents: 35 diff changeset	285 .attribute(Attributes.keyAttribute, toData(key))
6f35fb47ca24 Added test for serializing subclasses. Jacob Carlborg <doob@me.com> parents: 35 diff changeset	286 .attribute(Attributes.idAttribute, toData(id));
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	287 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	288
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	289 void archiveNull (string type, string key)
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	290 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	291 lastElement.element(Tags.nullTag)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	292 .attribute(Attributes.typeAttribute, toData(type))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	293 .attribute(Attributes.keyAttribute, toData(key));
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	294 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	295
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	296 void archiveObject (string runtimeType, string type, string key, Id id, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	297 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	298 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	299 lastElement = lastElement.element(Tags.objectTag)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	300 .attribute(Attributes.runtimeTypeAttribute, toData(runtimeType))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	301 .attribute(Attributes.typeAttribute, toData(type))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	302 .attribute(Attributes.keyAttribute, toData(key))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	303 .attribute(Attributes.idAttribute, toData(id));
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 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	306 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	307 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	308
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	309 void archivePointer (string key, Id id, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	310 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	311 restore(lastElement) in {
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	312 auto parent = lastElement;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	313 lastElement = doc.createNode(Tags.pointerTag);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	314
31 c68d29967c9f Fixed some bugs in the handling of pointers. Jacob Carlborg <doob@me.com> parents: 30 diff changeset	315 lastElement.attribute(Attributes.keyAttribute, toData(key))
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	316 .attribute(Attributes.idAttribute, toData(id));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	317
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	318 addArchivedPointer(id, parent, lastElement, key);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	319 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	320 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	321 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	322
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	323 void archivePointer (Id pointeeId, string key, Id id)
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	324 {
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	325 if (auto pointerNode = getArchivedPointer(id))
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	326 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	327 pointerNode.parent.element(Tags.pointerTag)
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	328 .attribute(Attributes.keyAttribute, toData(pointerNode.key))
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	329 .attribute(Attributes.idAttribute, toData(id))
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	330 .element(Tags.referenceTag, toData(pointeeId))
4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	331 .attribute(Attributes.keyAttribute, toData(key));
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	332 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	333 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	334
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	335 void archiveReference (string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	336 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	337 lastElement.element(Tags.referenceTag, toData(id))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	338 .attribute(Attributes.keyAttribute, toData(key));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	339 }
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 void archiveSlice (Slice slice, Id sliceId, Id arrayId)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	342 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	343 if (auto sliceNode = getArchivedArray(sliceId))
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 if (auto arrayNode = getArchivedArray(arrayId))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	346 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	347 sliceNode.parent.element(Tags.sliceTag, toData(arrayNode.id))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	348 .attribute(Attributes.keyAttribute, toData(sliceNode.key))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	349 .attribute(Attributes.offsetAttribute, toData(slice.offset))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	350 .attribute(Attributes.lengthAttribute, toData(slice.length));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	351 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	352 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	353 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	354
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	355 void archiveStruct (string type, string key, Id id, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	356 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	357 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	358 lastElement = lastElement.element(Tags.structTag)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	359 .attribute(Attributes.typeAttribute, toData(type))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	360 .attribute(Attributes.keyAttribute, toData(key))
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	361 .attribute(Attributes.idAttribute, toData(id));
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	362
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	363 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	364 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	365 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 void archiveTypedef (string type, string key, Id id, void delegate () dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	368 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	369 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	370 lastElement = lastElement.element(Tags.typedefTag)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	371 .attribute(Attributes.typeAttribute, toData(type))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	372 .attribute(Attributes.keyAttribute, toData(key))
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	373 .attribute(Attributes.idAttribute, toData(id));
26 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 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	376 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	377 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	378
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	379 void archive (string value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	380 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	381 archiveString(value, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	382 }
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 void archive (wstring value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	385 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	386 archiveString(value, key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	387 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	388
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	389 void archive (dstring value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	390 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	391 archiveString(value, key, id);
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	392 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	393
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	394 private void archiveString (T) (T value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	395 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	396 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	397 alias ElementTypeOfArray!(T) ElementType;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	398 auto array = Array(value.ptr, value.length, ElementType.sizeof);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	399
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	400 internalArchiveArray(array, ElementType.stringof, key, id, Tags.stringTag, toData(value));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	401 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	402 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	403
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	404 void archive (bool value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	405 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	406 archivePrimitive(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	407 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	408
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	409 void archive (byte value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	410 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	411 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	412 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	413
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	414 //currently not suppported by to!()
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	415 /*void archive (cdouble value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	416 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	417 archivePrimitive(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	418 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	419
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	420 //currently not implemented but a reserved keyword
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	421 /*void archive (cent value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	422 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	423 archivePrimitive(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	424 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	425
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	426 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	427 /*void archive (cfloat value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	428 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	429 archivePrimitive(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	430 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	431
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	432 void archive (char value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	433 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	434 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	435 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	436
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	437 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	438 /*void archive (creal value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	439 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	440 archivePrimitive(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	441 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	442
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	443 void archive (dchar value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	444 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	445 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	446 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	447
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	448 void archive (double value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	449 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	450 archivePrimitive(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	451 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	452
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	453 void archive (float value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	454 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	455 archivePrimitive(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	456 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	457
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	458 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	459 /*void archive (idouble value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	460 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	461 archivePrimitive(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	462 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	463
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	464 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	465 /*void archive (ifloat value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	466 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	467 archivePrimitive(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	468 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	469
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	470 void archive (int value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	471 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	472 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	473 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	474
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	475 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	476 /*void archive (ireal value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	477 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	478 archivePrimitive(value, key, id);
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	479 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	480
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	481 void archive (long value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	482 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	483 archivePrimitive(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	484 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	485
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	486 void archive (real value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	487 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	488 archivePrimitive(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	489 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	490
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	491 void archive (short value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	492 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	493 archivePrimitive(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	494 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	495
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	496 void archive (ubyte value, string key, Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	497 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	498 archivePrimitive(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	499 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	500
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	501 //currently not implemented but a reserved keyword
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	502 /*void archive (ucent value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	503 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	504 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	505 }*/
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	506
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	507 void archive (uint value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	508 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	509 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	510 }
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	511
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	512 void archive (ulong value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	513 {
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	514 archivePrimitive(value, key, id);
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	515 }
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	516
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	517 void archive (ushort value, string key, Id id)
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	518 {
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	519 archivePrimitive(value, key, id);
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	520 }
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	521
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	522 void archive (wchar value, string key, Id id)
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	523 {
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	524 archivePrimitive(value, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	525 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	526
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	527 private void archivePrimitive (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	528 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	529 lastElement.element(toData(T.stringof), toData(value))
30 9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	530 .attribute(Attributes.keyAttribute, toData(key))
9d1a8023bb89 Added IDs to every serialized value. Jacob Carlborg <doob@me.com> parents: 29 diff changeset	531 .attribute(Attributes.idAttribute, toData(id));
26 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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	534 Id unarchiveArray (string key, void delegate (size_t) dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	535 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	536 return restore!(Id)(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	537 auto element = getElement(Tags.arrayTag, key);
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	538
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	539 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	540 return Id.max;
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 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	543 auto len = getValueOfAttribute(Attributes.lengthAttribute);
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 if (!len)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	546 return Id.max;
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	547
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	548 auto length = fromData!(size_t)(len);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	549 auto id = getValueOfAttribute(Attributes.idAttribute);
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	550
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	551 if (!id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	552 return Id.max;
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	553
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	554 dg(length);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	555
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	556 return toId(id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	557 };
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	560 void unarchiveArray (Id id, void delegate (size_t) dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	561 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	562 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	563 auto element = getElement(Tags.arrayTag, to!(string)(id), Attributes.idAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	564
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	565 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	566 return;
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 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	569 auto len = getValueOfAttribute(Attributes.lengthAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	570
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	571 if (!len)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	572 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	573
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	574 auto length = fromData!(size_t)(len);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	575 auto stringId = getValueOfAttribute(Attributes.idAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	576
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	577 if (!stringId)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	578 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	579
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	580 dg(length);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	581 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	582 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	583
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	584 Id unarchiveAssociativeArray (string key, void delegate (size_t length) dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	585 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	586 return restore!(Id)(lastElement) in {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	587 auto element = getElement(Tags.associativeArrayTag, key);
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 if (!element.isValid)
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	590 return Id.max;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	591
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	592 lastElement = element;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	593 auto len = getValueOfAttribute(Attributes.lengthAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	594
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	595 if (!len)
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	596 return Id.max;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	597
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	598 auto length = fromData!(size_t)(len);
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	599 auto id = getValueOfAttribute(Attributes.idAttribute);
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	600
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	601 if (!id)
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	602 return Id.max;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	603
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	604 dg(length);
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	605
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	606 return toId(id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	607 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	608 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	609
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	610 void unarchiveAssociativeArrayKey (string key, void delegate () dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	611 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	612 internalUnarchiveAAKeyValue(key, Tags.keyTag, dg);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	613 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	614
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	615 void unarchiveAssociativeArrayValue (string key, void delegate () dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	616 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	617 internalUnarchiveAAKeyValue(key, Tags.valueTag, dg);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	618 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	619
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	620 private void internalUnarchiveAAKeyValue (string key, Data tag, void delegate () dg)
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 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	623 auto element = getElement(tag, 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 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	626 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	627
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	628 lastElement = element;
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 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	631 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	632 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	633
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	634 bool unarchiveEnumBool (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	635 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	636 return unarchiveEnum!(bool)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	637 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	638
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	639 byte unarchiveEnumByte (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	640 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	641 return unarchiveEnum!(byte)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	642 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	643
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	644 char unarchiveEnumChar (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	645 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	646 return unarchiveEnum!(char)(key);
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	649 dchar unarchiveEnumDchar (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	650 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	651 return unarchiveEnum!(dchar)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	652 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	653
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	654 int unarchiveEnumInt (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	655 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	656 return unarchiveEnum!(int)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	657 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	658
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	659 long unarchiveEnumLong (string key)
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 return unarchiveEnum!(long)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	662 }
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 short unarchiveEnumShort (string key)
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 return unarchiveEnum!(short)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	667 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	668
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	669 ubyte unarchiveEnumUbyte (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	670 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	671 return unarchiveEnum!(ubyte)(key);
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	674 uint unarchiveEnumUint (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	675 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	676 return unarchiveEnum!(uint)(key);
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	679 ulong unarchiveEnumUlong (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	680 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	681 return unarchiveEnum!(ulong)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	682 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	683
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	684 ushort unarchiveEnumUshort (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	685 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	686 return unarchiveEnum!(ushort)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	687 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	688
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	689 wchar unarchiveEnumWchar (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	690 {
45 3cd22957e411 Fixed deserializing of wchar enums for D2. Jacob Carlborg <doob@me.com> parents: 44 diff changeset	691 return unarchiveEnum!(wchar)(key);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	692 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	693
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	694 private T unarchiveEnum (T) (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	695 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	696 auto element = getElement(Tags.enumTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	697
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	698 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	699 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	700
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	701 return fromData!(T)(element.value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	702 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	703
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	704 void unarchiveObject (string key, out Id id, out Object result, void delegate () dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	705 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	706 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	707 auto tmp = getElement(Tags.objectTag, key, Attributes.keyAttribute, false);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	708
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	709 if (!tmp.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	710 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	711 lastElement = getElement(Tags.nullTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	712 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	713 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	714
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	715 lastElement = tmp;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	716
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	717 auto runtimeType = getValueOfAttribute(Attributes.runtimeTypeAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	718
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	719 if (!runtimeType)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	720 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	721
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	722 auto name = fromData!(string)(runtimeType);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	723 auto stringId = getValueOfAttribute(Attributes.idAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	724
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	725 if (!stringId)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	726 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	727
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	728 id = toId(stringId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	729 result = newInstance(name);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	730 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	731 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	732 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	733
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	734 Id unarchivePointer (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	735 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	736 return restore!(Id)(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	737 auto tmp = getElement(Tags.pointerTag, key, Attributes.keyAttribute, false);
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	738
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	739 if (!tmp.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	740 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	741 lastElement = getElement(Tags.nullTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	742 return Id.max;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	743 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	744
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	745 lastElement = tmp;
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	746 auto id = getValueOfAttribute(Attributes.idAttribute);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	747
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	748 if (!id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	749 return Id.max;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	750
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	751 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	752
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	753 return toId(id);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	754 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	755 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	756
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	757 Id unarchiveReference (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	758 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	759 auto element = getElement(Tags.referenceTag, key, Attributes.keyAttribute, false);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	760
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	761 if (element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	762 return toId(element.value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	763
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	764 return Id.max;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	765 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	766
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	767 Slice unarchiveSlice (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	768 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	769 auto element = getElement(Tags.sliceTag, key, Attributes.keyAttribute, false);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	770
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	771 if (element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	772 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	773 auto length = fromData!(size_t)(getValueOfAttribute(Attributes.lengthAttribute, element));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	774 auto offset = fromData!(size_t)(getValueOfAttribute(Attributes.offsetAttribute, element));
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	775 auto id = toId(element.value);
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	776
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	777 return Slice(length, offset, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	778 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	779
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	780 return Slice.init;
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 void unarchiveStruct (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	784 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	785 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	786 auto element = getElement(Tags.structTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	787
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	788 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	789 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	790
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	791 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	792 dg();
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 }
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 private T unarchiveTypeDef (T) (DataType key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	797 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	798 auto element = getElement(Tags.typedefTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	799
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	800 if (element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	801 lastElement = element;
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 return T.init;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	804 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	805
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	806 void unarchiveTypedef (string key, void delegate () dg)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	807 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	808 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	809 auto element = getElement(Tags.typedefTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	810
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	811 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	812 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	813
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	814 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	815 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	816 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	817 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	818
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	819 string unarchiveString (string key, out Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	820 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	821 return internalUnarchiveString!(string)(key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	822 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	823
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	824 wstring unarchiveWstring (string key, out Id id)
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 return internalUnarchiveString!(wstring)(key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	827 }
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 dstring unarchiveDstring (string key, out Id id)
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 return internalUnarchiveString!(dstring)(key, id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	832 }
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 private T internalUnarchiveString (T) (string key, out Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	835 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	836 auto element = getElement(Tags.stringTag, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	837
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	838 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	839 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	840
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	841 auto value = fromData!(T)(element.value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	842 auto stringId = getValueOfAttribute(Attributes.idAttribute, element);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	843
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	844 if (!stringId)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	845 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	846
35 511d1ef4e299 Now all unit tests pass on latest DMD2 compiler. Jacob Carlborg <doob@me.com> parents: 34 diff changeset	847 id = toId(stringId);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	848 return value;
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	851 string unarchiveString (Id id)
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 return internalUnarchiveString!(string)(id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	854 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	855
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	856 wstring unarchiveWstring (Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	857 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	858 return internalUnarchiveString!(wstring)(id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	859 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	860
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	861 dstring unarchiveDstring (Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	862 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	863 return internalUnarchiveString!(dstring)(id);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	864 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	865
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	866 private T internalUnarchiveString (T) (Id id)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	867 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	868 auto element = getElement(Tags.stringTag, to!(string)(id), Attributes.idAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	869
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	870 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	871 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	872
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	873 return fromData!(T)(element.value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	874 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	875
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	876 bool unarchiveBool (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	877 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	878 return unarchivePrimitive!(bool)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	879 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	880
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	881 byte unarchiveByte (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	882 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	883 return unarchivePrimitive!(byte)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	884 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	885
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	886 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	887 /*cdouble unarchiveCdouble (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	888 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	889 return unarchivePrimitive!(cdouble)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	890 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	891
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	892 //currently not implemented but a reserved keyword
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	893 /*cent unarchiveCent (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	894 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	895 return unarchivePrimitive!(cent)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	896 }*/
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	897
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	898 // currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	899 /*cfloat unarchiveCfloat (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	900 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	901 return unarchivePrimitive!(cfloat)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	902 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	903
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	904 char unarchiveChar (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	905 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	906 return unarchivePrimitive!(char)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	907 }
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 //currently not implemented but a reserved keyword
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	910 /*creal unarchiveCreal (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	911 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	912 return unarchivePrimitive!(creal)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	913 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	914
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	915 dchar unarchiveDchar (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	916 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	917 return unarchivePrimitive!(dchar)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	918 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	919
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	920 double unarchiveDouble (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	921 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	922 return unarchivePrimitive!(double)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	923 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	924
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	925 float unarchiveFloat (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	926 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	927 return unarchivePrimitive!(float)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	928 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	929
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	930 //currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	931 /*idouble unarchiveIdouble (string key)
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 return unarchivePrimitive!(idouble)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	934 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	935
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	936 // currently not suppported by to!()*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	937 /*ifloat unarchiveIfloat (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	938 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	939 return unarchivePrimitive!(ifloat)(key);
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 int unarchiveInt (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	943 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	944 return unarchivePrimitive!(int)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	945 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	946
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	947 // currently not suppported by to!()
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	948 /*ireal unarchiveIreal (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	949 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	950 return unarchivePrimitive!(ireal)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	951 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	952
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	953 long unarchiveLong (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	954 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	955 return unarchivePrimitive!(long)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	956 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	957
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	958 real unarchiveReal (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	959 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	960 return unarchivePrimitive!(real)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	961 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	962
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	963 short unarchiveShort (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	964 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	965 return unarchivePrimitive!(short)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	966 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	967
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	968 ubyte unarchiveUbyte (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	969 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	970 return unarchivePrimitive!(ubyte)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	971 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	972
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	973 // currently not implemented but a reserved keyword
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	974 /*ucent unarchiveCcent (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	975 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	976 return unarchivePrimitive!(ucent)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	977 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	978
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	979 uint unarchiveUint (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	980 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	981 return unarchivePrimitive!(uint)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	982 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	983
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	984 ulong unarchiveUlong (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	985 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	986 return unarchivePrimitive!(ulong)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	987 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	988
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	989 ushort unarchiveUshort (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	990 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	991 return unarchivePrimitive!(ushort)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	992 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	993
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	994 wchar unarchiveWchar (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	995 {
44 1fef41162966 Fixed deserialization of whcar for D2. Fixed events for D2. Jacob Carlborg <doob@me.com> parents: 43 diff changeset	996 return unarchivePrimitive!(wchar)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	997 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	998
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	999 T unarchivePrimitive (T) (string key)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1000 {
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	1001 auto element = getElement(toData(T.stringof), key);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1002
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1003 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1004 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1005
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1006 return fromData!(T)(element.value);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1007 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1008
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1009 void postProcessArray (Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1010 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1011 if (auto array = getArchivedArray(id))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1012 array.parent.attach(array.node);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1013 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1014
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1015 void postProcessPointer (Id id)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1016 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1017 if (auto pointer = getArchivedPointer(id))
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1018 pointer.parent.attach(pointer.node);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1019 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1020
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1021 private void addArchivedArray (Id id, doc.Node parent, doc.Node element, string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1022 {
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1023 archivedArrays[id] = Node(parent, element, id, key);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1024 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1025
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1026 private Node* getArchivedArray (Id id)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1027 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1028 if (auto array = id in archivedArrays)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1029 return array;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1030
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1031 if (errorCallback)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1032 errorCallback(new ArchiveException(`Could not continue archiving due to no array with the Id "` ~ to!(string)(id) ~ `" was found.`, __FILE__, __LINE__), [to!(string)(id)]);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1033
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1034 return null;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1035 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1036
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1037 private void addArchivedPointer (Id id, doc.Node parent, doc.Node element, string key)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1038 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1039 archivedPointers[id] = Node(parent, element, id, key);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1040 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1041
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1042 private Node* getArchivedPointer (Id id)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1043 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1044 if (auto pointer = id in archivedPointers)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1045 return pointer;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1046
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1047 if (errorCallback)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1048 errorCallback(new ArchiveException(`Could not continue archiving due to no pointer with the Id "` ~ to!(string)(id) ~ `" was found.`, __FILE__, __LINE__), [to!(string)(id)]);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1049
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1050 return null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1051 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1052
34 068e853b9c07 Cleaned up. Updated to latest D2 compiler. Jacob Carlborg <doob@me.com> parents: 33 diff changeset	1053 private doc.Node getElement (Data tag, string key, Data attribute = Attributes.keyAttribute, bool throwOnError = true)
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1054 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1055 auto set = lastElement.query[tag].attribute((doc.Node node) {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1056 if (node.name == attribute && node.value == key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1057 return true;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1058
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1059 return false;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1060 });
33 4fea56a5849f Now both internal and external pointers work. Jacob Carlborg <doob@me.com> parents: 31 diff changeset	1061
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1062 version (Tango)
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1063 {
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1064 if (set.nodes.length == 1)
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1065 return set.nodes[0].parent;
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1066 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1067
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1068 else
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1069 { // Temporary fix, this is probably a problem in the Phobos
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1070 // implementation of the XML query function
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1071 if (set.nodes.length > 0)
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1072 return set.nodes[set.nodes.length - 1].parent;
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1073 }
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1074
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1075 if (throwOnError && errorCallback)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1076 {
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1077 if (set.nodes.length == 0)
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1078 errorCallback(new ArchiveException(`Could not find an element "` ~ to!(string)(tag) ~ `" with the attribute "` ~ to!(string)(Attributes.keyAttribute) ~ `" with the value "` ~ to!(string)(key) ~ `".`, __FILE__, __LINE__), [tag, Attributes.keyAttribute, key]);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1079
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1080 else
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1081 errorCallback(new ArchiveException(`Could not unarchive the value with the key "` ~ to!(string)(key) ~ `" due to malformed data.`, __FILE__, __LINE__), [tag, Attributes.keyAttribute, key]);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1082 }
46 d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1083
d6fbd0b3586e Issue 8: Wrong results for array of arrays. (Temporary fix). Jacob Carlborg <doob@me.com> parents: 45 diff changeset	1084 return doc.Node.invalid;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1085 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1086
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1087 private Data getValueOfAttribute (Data attribute, doc.Node element = doc.Node.invalid)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1088 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1089 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1090 element = lastElement;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1091
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1092 auto set = element.query.attribute(attribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1093
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1094 if (set.nodes.length == 1)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1095 return set.nodes[0].value;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1096
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1097 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1098 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1099 if (errorCallback)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1100 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1101 if (set.nodes.length == 0)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1102 errorCallback(new ArchiveException(`Could not find the attribute "` ~ to!(string)(attribute) ~ `".`, __FILE__, __LINE__), [attribute]);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1103
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1104 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1105 errorCallback(new ArchiveException(`Could not unarchive the value of the attribute "` ~ to!(string)(attribute) ~ `" due to malformed data.`, __FILE__, __LINE__), [attribute]);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1106 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1107 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1108
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1109 return null;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1110 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1111
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1112 version (Tango)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1113 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1114 private template errorMessage (ArchiveMode mode = ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1115 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1116 static if (mode == ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1117 const errorMessage = "Could not continue archiving due to unrecognized data format: ";
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1118
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1119 else static if (mode == ArchiveMode.unarchiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1120 const errorMessage = "Could not continue unarchiving due to unrecognized data format: ";
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1121 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1122 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1123
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1124 else
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1125 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1126 mixin(
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1127 `private template errorMessage (ArchiveMode mode = ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1128 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1129 static if (mode == ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1130 enum errorMessage = "Could not continue archiving due to unrecognized data format: ";
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1131
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1132 else static if (mode == ArchiveMode.unarchiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1133 enum errorMessage = "Could not continue unarchiving due to unrecognized data format: ";
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1134 }`
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1135 );
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1136 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1137 }

Mercurial > projects > orange

annotate orange/serialization/archives/XMLArchive.d @ 46:d6fbd0b3586e