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

annotate orange/serialization/archives/XMLArchive.d @ 29:c422ff6477dd experimental

Better handling of serializing pointers.

author	Jacob Carlborg <doob@me.com>
date	Sun, 21 Nov 2010 16:53:46 +0100
parents	bffcbc8c392b
children	9d1a8023bb89

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 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	48 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	49 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	50 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	51 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	52 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	53 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	54 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	55 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	56 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	57 static const Data baseTypeAttribute = "baseType";
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	58 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	59
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	60 private struct Node
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	61 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	62 XMLDocument!(U).Node parent;
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	63 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	64 Id id;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	65 string key;
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	66 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	67
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	68 private
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	69 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	70 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	71 Data archiveVersion = "1.0.0";
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	72
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	73 XMLDocument!(U) doc;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	74 doc.Node lastElement;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	75
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	76 bool hasBegunArchiving;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	77 bool hasBegunUnarchiving;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	78
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	79 Node[Id] archivedArrays;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	80 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	81 void[][Data] unarchivedSlices;
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	82 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	83
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	84 this (ErrorCallback errorCallback = null)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	85 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	86 super(errorCallback);
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	87 doc = new XMLDocument!(U);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	88 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	89
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	90 public void beginArchiving ()
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	91 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	92 if (!hasBegunArchiving)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	93 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	94 doc.header;
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	95 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	96 .attribute(Attributes.typeAttribute, archiveType)
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	97 .attribute(Attributes.versionAttribute, archiveVersion);
99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	98 lastElement = lastElement.element(Tags.dataTag);
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	99
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	100 hasBegunArchiving = true;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	101 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	102 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	103
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	104 public void beginUnarchiving (UntypedData untypedData)
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	105 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	106 auto data = cast(Data) untypedData;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	107
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	108 if (!hasBegunUnarchiving)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	109 {
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	110 doc.parse(data);
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	111 hasBegunUnarchiving = true;
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	112
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	113 auto set = doc.query[Tags.archiveTag][Tags.dataTag];
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	114
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	115 if (set.nodes.length == 1)
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	116 lastElement = set.nodes[0];
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	117
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	118 else
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	119 {
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	120 if (errorCallback)
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	121 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	122 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	123
18 3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	124 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	125 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	126
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	127 else
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	128 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	129 }
3d42ea434d46 Added an error callback. Fixes #3 and #4. Jacob Carlborg <doob@me.com> parents: 11 diff changeset	130 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	131 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	132 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	133
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	134 UntypedData untypedData ()
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	135 {
9 99c52d46822a Serialization works now with D2, deserialization still doesn't work Jacob Carlborg <doob@me.com> parents: 6 diff changeset	136 return doc.toString();
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	137 }
f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	138
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	139 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	140 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	141 return doc.toString;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	142 }
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 void reset ()
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	145 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	146 hasBegunArchiving = false;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	147 hasBegunUnarchiving = false;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	148 doc.reset;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	149 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	150
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	151 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	152 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	153 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	154 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	155 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	156 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	157 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	158
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	159 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	160 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	161 auto parent = lastElement;
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	162
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	163 if (array.length == 0)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	164 lastElement = lastElement.element(tag);
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	165
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	166 else
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	167 lastElement = doc.createNode(tag, content);
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	168
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	169 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	170 .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	171 .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	172 .attribute(Attributes.idAttribute, toData(id));
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	173
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	174 addArchivedArray(id, parent, lastElement, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	175 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	176
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	177 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	178 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	179 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	180 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	181 .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	182 .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	183 .attribute(Attributes.lengthAttribute, toData(length))
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	184 .attribute(Attributes.keyAttribute, key)
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	185 .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	186
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	187 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	188 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	189 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	190
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	191 void archiveAssociativeArrayKey (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	192 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	193 internalArchiveAAKeyValue(key, Tags.keyTag, dg);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	194 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	195
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	196 void archiveAssociativeArrayValue (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	197 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	198 internalArchiveAAKeyValue(key, Tags.valueTag, dg);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	199 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	200
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	201 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	202 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	203 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	204 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	205 .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	206
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	207 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	208 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	209 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	210
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	211 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	212 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	213 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	214 }
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 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	217 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	218 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	219 }
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 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	222 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	223 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	224 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	225
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	226 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	227 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	228 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	229 }
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 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	232 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	233 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	234 }
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 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	237 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	238 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	239 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	240
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	241 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	242 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	243 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	244 }
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 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	247 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	248 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	249 }
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 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	252 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	253 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	254 }
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	255
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	256 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	257 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	258 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	259 }
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 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	262 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	263 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	264 }
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 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	267 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	268 internalArchiveEnum(value, type, key, id);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	269 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	270
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	271 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	272 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	273 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	274 .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	275 .attribute(Attributes.baseTypeAttribute, toData(T.stringof))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	276 .attribute(Attributes.keyAttribute, toData(key));
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	277 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	278
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	279 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	280 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	281 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	282 lastElement = lastElement.element(Tags.baseTag)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	283 .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	284 .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	285 };
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	286 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	287
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	288 void archiveNull (string type, string key)
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	289 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	290 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	291 .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	292 .attribute(Attributes.keyAttribute, toData(key));
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	293 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	294
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	295 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	296 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	297 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	298 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	299 .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	300 .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	301 .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	302 .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	303
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	304 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	305 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	306 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	307
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	308 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	309 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	310 restore(lastElement) in {
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	311 auto parent = lastElement;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	312 lastElement = doc.createNode(Tags.pointerTag);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	313
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	314 lastElement.element(Tags.pointerTag)
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	315 .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	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
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	323 void archivePointer (Id pointerId, Id pointeeId)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	324 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	325 if (auto pointerNode = getArchivedPointer(pointerId))
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	326 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	327 pointerNode.parent.element(Tags.referenceTag, toData(pointeeId)).
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	328 attribute(Attributes.keyAttribute, toData(pointerNode.key));
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	329 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	330 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	331
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	332 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	333 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	334 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	335 .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	336 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	337
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	338 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	339 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	340 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	341 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	342 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	343 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	344 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	345 .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	346 .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	347 .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	348 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	349 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	350 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	351
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	352 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	353 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	354 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	355 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	356 .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	357 .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	358
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	359 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	360 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	361 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	362
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	363 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	364 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	365 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	366 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	367 .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	368 .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	369
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	370 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	371 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	372 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	373
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	374 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	375 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	376 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	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 (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	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 (dstring value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	385 {
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	386 archiveString(value, key, id);
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	387 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	388
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	389 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	390 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	391 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	392 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	393 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	394
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	395 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	396 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	397 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	398
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	399 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	400 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	401 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	402 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	403
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	404 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	405 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	406 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	407 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 // 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	410 /*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	411 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	412 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	413 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	414
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	415 //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	416 /*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	417 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	418 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	419 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	420
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	421 //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	422 /*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	423 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	424 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	425 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	426
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	427 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	428 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	429 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	430 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 //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	433 /*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	434 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	435 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	436 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	437
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	438 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	439 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	440 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	441 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 (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	444 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	445 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	446 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	447
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	448 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	449 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	450 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	451 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	452
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	453 //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	454 /*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	455 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	456 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	457 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	458
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	459 //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	460 /*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	461 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	462 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	463 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	464
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	465 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	466 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	467 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	468 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 //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	471 /*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	472 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	473 archivePrimitive(value, key);
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	474 }*/
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	475
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	476 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	477 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	478 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	479 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	480
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	481 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	482 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	483 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	484 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	485
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	486 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	487 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	488 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	489 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	490
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	491 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	492 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	493 archivePrimitive(value, key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	494 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	495
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	496 //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	497 /*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	498 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	499 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	500 }*/
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	501
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	502 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	503 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	504 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	505 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 (ulong value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	508 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	509 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	510 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 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 (ushort value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	513 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	514 archivePrimitive(value, key);
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	515 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	516
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	517 void archive (wchar value, string key, Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	518 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	519 archivePrimitive(value, key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	520 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	521
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	522 private void archivePrimitive (T) (T value, string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	523 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	524 lastElement.element(toData(T.stringof), toData(value))
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	525 .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	526 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	527
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	528 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	529 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	530 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	531 auto element = getElement(Tags.arrayTag, key);
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 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	534 return Id.max;
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 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	537 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	538
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	539 if (!len)
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;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	541
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	542 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	543 auto id = getValueOfAttribute(Attributes.idAttribute);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	544
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	545 if (!id)
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;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	547
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	548 dg(length);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	549
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	550 return id.toId();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	551 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	552 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	553
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	554 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	555 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	556 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	557 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	558
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	559 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	560 return;
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 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	563 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	564
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	565 if (!len)
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 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	569 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	570
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	571 if (!stringId)
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 dg(length);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	575 };
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
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	578 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	579 {
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	580 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	581 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	582
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	583 if (!element.isValid)
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	584 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	585
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	586 lastElement = element;
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	587 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	588
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	589 if (!len)
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	592 auto length = fromData!(size_t)(len);
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	593 auto id = getValueOfAttribute(Attributes.idAttribute);
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	594
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	595 if (!id)
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 dg(length);
28 bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	599
bffcbc8c392b Associative arrays are now treated as references. Jacob Carlborg <doob@me.com> parents: 26 diff changeset	600 return id.toId();
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	601 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	602 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	603
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	604 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	605 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	606 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	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 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	610 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	611 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	612 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	613
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	614 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	615 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	616 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	617 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	618
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	619 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	620 return;
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 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	623
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	624 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	625 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	626 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	627
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	628 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	629 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	630 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	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 byte unarchiveEnumByte (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	634 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	635 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	636 }
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 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	639 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	640 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	641 }
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 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	644 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	645 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	646 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	647
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	648 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	649 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	650 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	651 }
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 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	654 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	655 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	656 }
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 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	659 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	660 return unarchiveEnum!(short)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	661 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	662
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	663 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	664 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	665 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	666 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	667
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	668 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	669 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	670 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	671 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	672
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	673 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	674 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	675 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	676 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	677
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	678 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	679 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	680 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	681 }
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 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	684 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	685 return unarchiveEnum!(wchar)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	686 }
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 private T unarchiveEnum (T) (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	689 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	690 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	691
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	692 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	693 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	694
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	695 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	696 }
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 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	699 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	700 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	701 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	702
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	703 if (!tmp.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	704 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	705 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	706 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	707 }
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 lastElement = tmp;
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 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	712
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	713 if (!runtimeType)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	714 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	715
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	716 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	717 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	718
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	719 if (!stringId)
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 id = stringId.toId();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	723 result = newInstance(name);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	724 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	725 };
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	726 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	727
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	728 Id unarchivePointer (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	729 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	730 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	731 auto tmp = getElement(Tags.pointerTag, 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	732
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	733 if (!tmp.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	734 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	735 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	736 return Id.max;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	737 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	738
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	739 lastElement = tmp;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	740 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	741
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	742 if (!stringId)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	743 return Id.max;
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 dg();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	746
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	747 return stringId.toId();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	748 };
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	749 }
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 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	752 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	753 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	754
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	755 if (element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	756 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	757
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	758 return Id.max;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	759 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	760
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	761 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	762 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	763 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	764
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	765 if (element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	766 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	767 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	768 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	769 auto id = toId(element.value);
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 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	772 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	773
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	774 return Slice.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	775 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	776
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	777 void unarchiveStruct (string key, void delegate () dg)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	778 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	779 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	780 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	781
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	782 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	783 return;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	784
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	785 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	786 dg();
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 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	789
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	790 private 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	791 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	792 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	793
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	794 if (element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	795 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	796
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	797 return T.init;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	798 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	799
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	800 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	801 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	802 restore(lastElement) in {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	803 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	804
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	805 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	806 return;
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 lastElement = element;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	809 dg();
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 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	812
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	813 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	814 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	815 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	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 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	819 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	820 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	821 }
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 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	824 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	825 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	826 }
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 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	829 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	830 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	831
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	832 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	833 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	834
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	835 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	836 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	837
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	838 if (!stringId)
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 id = stringId.toId();
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	842 return value;
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	845 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	846 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	847 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	848 }
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 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	851 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	852 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	853 }
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 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	856 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	857 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	858 }
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 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	861 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	862 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	863
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	864 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	865 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	866
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	867 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	868 }
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 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	871 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	872 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	873 }
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 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	876 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	877 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	878 }
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 //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	881 /*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	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!(cdouble)(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 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	887 /*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	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!(cent)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	890 }*/
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	891
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	892 // 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	893 /*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	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!(cfloat)(key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	896 }*/
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	897
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	898 char unarchiveChar (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	899 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	900 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	901 }
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 //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	904 /*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	905 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	906 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	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 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	910 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	911 return unarchivePrimitive!(dchar)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	912 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	913
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	914 double unarchiveDouble (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	915 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	916 return unarchivePrimitive!(double)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	917 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	918
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	919 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	920 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	921 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	922 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	923
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	924 //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	925 /*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	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!(idouble)(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 /*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	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!(ifloat)(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 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	937 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	938 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	939 }
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 // 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	942 /*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	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!(ireal)(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 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	948 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	949 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	950 }
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 real unarchiveReal (string key)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	953 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	954 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	955 }
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 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	958 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	959 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	960 }
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 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	963 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	964 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	965 }
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 // 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	968 /*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	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!(ucent)(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 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	974 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	975 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	976 }
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 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	979 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	980 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	981 }
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 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	984 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	985 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	986 }
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 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	989 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	990 return unarchivePrimitive!(wchar)(key);
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	991 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	992
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	993 T unarchivePrimitive (T) (string key)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	994 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	995 auto element = getElement(toData(T.stringof), key);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	996
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	997 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	998 return T.init;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	999
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1000 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	1001 }
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 void postProcessArray (Id id)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1004 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1005 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	1006 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	1007 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1008
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1009 void postProcessPointer (Id id)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1010 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1011 if (auto pointer = getArchivedPointer(id))
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1012 pointer.parent.attach(pointer.node);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1013 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1014
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1015 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	1016 {
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1017 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	1018 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1019
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1020 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	1021 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1022 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	1023 return array;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1024
29 c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1025 if (errorCallback)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1026 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	1027
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1028 return null;
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1029 }
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1030
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1031 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	1032 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1033 archivedPointers[id] = Node(parent, element, id, key);
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1034 }
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 private Node* getArchivedPointer (Id id)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1037 {
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1038 if (auto pointer = id in archivedPointers)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1039 return pointer;
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 if (errorCallback)
c422ff6477dd Better handling of serializing pointers. Jacob Carlborg <doob@me.com> parents: 28 diff changeset	1042 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	1043
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1044 return null;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1045 }
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1046
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1047 private doc.Node getElement (Data tag, string k, Data attribute = Attributes.keyAttribute, bool throwOnError = true)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1048 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1049 auto key = toData(k);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1050
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1051 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	1052 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	1053 return true;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1054
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1055 return false;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1056 });
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1057
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1058 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	1059 return set.nodes[0].parent;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1060
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1061 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1062 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1063 if (throwOnError && errorCallback)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1064 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1065 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	1066 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]);
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1069 errorCallback(new ArchiveException(`Could not unarchive the value with the key "` ~ to!(string)(key) ~ `" due to malformed data.`, __FILE__, __LINE__), [tag, Attributes.keyAttribute, key]);
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1070 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1071
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1072 return doc.Node.invalid;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1073 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1074 }
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1075
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1076 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	1077 {
26 78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1078 if (!element.isValid)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1079 element = lastElement;
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1080
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1081 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	1082
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1083 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	1084 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	1085
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1086 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1087 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1088 if (errorCallback)
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1089 {
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1090 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	1091 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	1092
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1093 else
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1094 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	1095 }
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
78e5fef4bbf2 Third step in refactoring the API. Stating to add unit tests. Jacob Carlborg <doob@me.com> parents: 25 diff changeset	1098 return null;
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1099 }
55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1100
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1101 version (Tango)
24 55f0a9d5df8d First step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 22 diff changeset	1102 {
25 b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1103 private template errorMessage (ArchiveMode mode = ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1104 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1105 static if (mode == ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1106 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	1107
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1108 else static if (mode == ArchiveMode.unarchiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1109 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	1110 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1111 }
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1112
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1113 else
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1114 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1115 mixin(
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1116 `private template errorMessage (ArchiveMode mode = ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1117 {
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1118 static if (mode == ArchiveMode.archiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1119 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	1120
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1121 else static if (mode == ArchiveMode.unarchiving)
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1122 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	1123 }`
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1124 );
b51e953f79eb Second step in refactoring the API. Jacob Carlborg <doob@me.com> parents: 24 diff changeset	1125 }
0 f7b078e85f7f First commit Jacob Carlborg <doob@me.com> parents: diff changeset	1126 }

Mercurial > projects > orange

annotate orange/serialization/archives/XMLArchive.d @ 29:c422ff6477dd experimental