projects/mde: mde/file/deserialize.d annotate

annotate mde/file/deserialize.d @ 154:0520cc00c0cc

Better error reporting for loading translations; avoided an infinite loop.

author	Diggory Hardy <diggory.hardy@gmail.com>
date	Sat, 18 Apr 2009 12:02:33 +0200
parents	7f7b40fed72b
children

rev	line source
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	1 /* LICENSE BLOCK
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	2 Part of mde: a Modular D game-oriented Engine
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	3 Copyright © 2007-2008 Diggory Hardy
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	4
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	5 This program is free software: you can redistribute it and/or modify it under the terms
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	6 of the GNU General Public License as published by the Free Software Foundation, either
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	7 version 2 of the License, or (at your option) any later version.
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	8
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	9 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	10 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	11 See the GNU General Public License for more details.
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	12
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	13 You should have received a copy of the GNU General Public License
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	14 along with this program. If not, see <http://www.gnu.org/licenses/>. */
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	15
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	16 /**************************************************************************************************
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	17 * Generic deserialization templated function.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	18 *
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	19 * Supports:
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	20 * Associative arrays, dynamic arrays (with usual formatting of strings), structs, char types,
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	21 * bool, int types, float types.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	22 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	23 * There are also some public utility functions with their own documentation.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	24 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	25 * Examples:
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	26 * ------------------------------------------------------------------------------------------------
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	27 * // Basic examples:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	28 * ulong a = deserialize!(ulong) ("20350");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	29 * float d = deserialize!(float) (" 1.2e-9 ");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	30 * int[] b = deserialize!(int[]) ("[0,1,2,3]");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	31 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	32 * // String and char[] syntax:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	33 * char[] c = deserialize!(char[]) ("\"A string\"");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	34 * char[] e = deserialize!(char[]) ("['a','n','o','t','h','e','r', ' ' ,'s','t','r','i','n','g']");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	35 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	36 * // These be used interchangably; here's a more complex example of an associative array:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	37 * bool[char[]] f = deserialize!(bool[char[]]) ("[ \"one\":true, ['t','w','o']:false, \"three\":1, \"four\":000 ]");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	38 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	39 * // There is also a special notation for ubyte[] types:
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	40 * // The digits following 0x must be in pairs and each specify one ubyte.
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	41 * assert ( deserialize!(ubyte[]) (`0x01F2AC`) == deserialize!(ubyte[]) (`[01 ,0xF2, 0xAC]`) );
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	42 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	43 * // There's no limit to the complexity!
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	44 * char[char[][][][char]][bool] z = ...; // don't expect me to write this!
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	45 * ------------------------------------------------------------------------------------------------
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	46 *
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	47 * Throws:
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	48 * May throw a ParseException or a UnicodeException (which both extend TextException).
d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	49 *
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	50 * TODO: Optimize memory allocation (if possible?). Test best sizes for initial allocations
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	51 * instead of merely guessing?
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	52 *************************************************************************************************/
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	53 //NOTE: in case of multiple formats, make this a dummy module importing both serialize modules,
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	54 // or put all the code here.
81 d8fccaa45d5f Moved file IO code from mde/mergetag to mde/file[/mergetag] and changed how some errors are caught. Diggory Hardy <diggory.hardy@gmail.com> parents: 79 diff changeset	55 module mde.file.deserialize;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	56
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	57 // tango imports
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	58 import tango.core.Exception : TextException, UnicodeException;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	59 import cInt = tango.text.convert.Integer;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	60 import cFloat = tango.text.convert.Float;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	61 import Utf = tango.text.convert.Utf;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	62 import Util = tango.text.Util;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	63
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	64 /**
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	65 * Base class for deserialize exceptions.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	66 */
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	67 class ParseException : TextException
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	68 {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	69 this( char[] msg )
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	70 {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	71 super( msg );
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	72 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	73 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	74
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	75 alias deserialize parseTo; // support the old name
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	76
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	77 //BEGIN deserialize templates
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	78
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	79 // Associative arrays
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	80
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	81 T[S] deserialize(T : T[S], S) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	82 src = Util.trim(src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	83 if (src.length < 2 \|\| src[0] != '[' \|\| src[$-1] != ']')
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	84 throw new ParseException ("Invalid associative array: not [ ... ]"); // bad braces.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	85
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	86 T[S] ret;
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	87 foreach (char[] pair; Split (src[1..$-1])) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	88 uint i = 0;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	89 while (i < pair.length) { // advance to the ':'
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	90 char c = pair[i];
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	91 if (c == ':') break;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	92 if (c == '\'' \|\| c == '"') { // string or character
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	93 ++i;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	94 while (i < pair.length && pair[i] != c) {
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	95 if (pair[i] == '\\')
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	96 ++i; // escape seq.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	97 ++i;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	98 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	99 // Could have an unterminated ' or " causing i >= pair.length, but:
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	100 // 1. Impossible: Split would have thrown
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	101 // 2. In any case this would be caught below.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	102 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	103 ++i;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	104 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	105 if (i >= pair.length)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	106 throw new ParseException ("Invalid associative array: encountered [ ... KEY] (missing :DATA)");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	107 ret[deserialize!(S) (pair[0..i])] = deserialize!(T) (pair[i+1..$]);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	108 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	109 return ret;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	110 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	111
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	112
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	113 // Arrays
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	114
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	115 T[] deserialize(T : T[]) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	116 src = Util.trim(src);
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	117 if (src.length >= 2 && src[0] == '[' && src[$-1] == ']')
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	118 return toArray!(T[]) (src);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	119 throw new ParseException ("Invalid array: not [ ... ]");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	120 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	121
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	122 // String (array special case)
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	123 T deserialize(T : char[]) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	124 src = Util.trim(src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	125 if (src.length >= 2 && src[0] == '"' && src[$-1] == '"') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	126 src = src[1..$-1];
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	127 T ret;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	128 ret.length = src.length; // maximum length; retract to actual length later
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	129 uint i = 0;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	130 for (uint t = 0; t < src.length;) {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	131 // process a block of non-escaped characters
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	132 uint s = t;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	133 while (t < src.length && src[t] != '\\') ++t; // non-escaped characters
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	134 uint j = i + t - s;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	135 ret[i..j] = src[s..t]; // copy a block
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	136 i = j;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	137
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	138 // process a block of escaped characters
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	139 while (t < src.length && src[t] == '\\') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	140 t++;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	141 if (t == src.length)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	142 throw new ParseException ("Invalid string: ends \\\" !"); // next char is "
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	143 ret[i++] = unEscapeChar (src[t++]); // throws if it's invalid
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	144 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	145 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	146 return ret[0..i];
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	147 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	148 else if (src.length >= 2 && src[0] == '[' && src[$-1] == ']')
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	149 return toArray!(T) (src);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	150 throw new ParseException ("Invalid string: not quoted (\"*\") or char array (['a',...,'c'])");
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	151 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	152 // Unicode conversions for strings:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	153 T deserialize(T : wchar[]) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	154 // May throw a UnicodeException; don't bother catching and rethrowing:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	155 return Utf.toString16 (deserialize!(char[]) (src));
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	156 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	157 T deserialize(T : dchar[]) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	158 // May throw a UnicodeException; don't bother catching and rethrowing:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	159 return Utf.toString32 (deserialize!(char[]) (src));
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	160 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	161
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	162 // Binary (array special case)
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	163 T deserialize(T : ubyte[]) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	164 src = Util.trim(src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	165 // Standard case:
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	166 if (src.length >= 2 && src[0] == '[' && src[$-1] == ']') return toArray!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	167 // Special case: sequence of hex digits, each pair of which is a ubyte
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	168 if (src.length >= 2 && src[0..2] == "0x") {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	169 src = src[2..$]; // strip down to actual digits
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	170
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	171 // Must be in pairs:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	172 if (src.length % 2 == 1)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	173 throw new ParseException ("Invalid binary: odd number of chars");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	174
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	175 T ret;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	176 ret.length = src.length / 2; // exact
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	177
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	178 for (uint i, pos; pos + 1 < src.length; ++i) {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	179 ubyte x = readHexChar(src, pos) << 4;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	180 x \|= readHexChar(src, pos);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	181 ret[i] = x;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	182 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	183 return ret;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	184 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	185 else throw new ParseException ("Invalid ubyte[]: not an array and doesn't start 0x");
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	186 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	187
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	188
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	189 // Basic types
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	190
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	191 // Char
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	192 // Assumes value is <= 127 (for valid UTF-8), since input would be invalid UTF-8 if not anyway.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	193 // (And we're not really interested in checking for valid unicode; char[] conversions don't either.)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	194 T deserialize(T : char) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	195 src = Util.trim(src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	196 if (src.length < 3 \|\| src[0] != '\'' \|\| src[$-1] != '\'')
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	197 throw new ParseException ("Invalid char: not 'x' or '\\x'");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	198 if (src[1] != '\\') {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	199 if (src.length == 3)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	200 return src[1]; // Either non escaped
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	201 throw new ParseException ("Invalid char: too long (or non-ASCII)");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	202 } else if (src.length == 4)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	203 return unEscapeChar (src[2]); // Or escaped
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	204
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	205 throw new ParseException ("Invalid char: '\\'");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	206 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	207 // Basic unicode convertions for wide-chars.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	208 T deserialize(T : wchar) (char[] src) {
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	209 src = Util.trim(src);
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	210 if (src.length < 3 \|\| src[0] != '\'' \|\| src[$-1] != '\'')
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	211 throw new ParseException ("Invalid char: not 'x' or '\\x'");
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	212 T[] t = Utf.toString16 (src[1..$-1]);
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	213 if (t.length == 1)
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	214 return t[0];
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	215 else
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	216 throw new ParseException ("Invalid char: not one character");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	217 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	218 T deserialize(T : dchar) (char[] src) {
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	219 src = Util.trim(src);
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	220 if (src.length < 3 \|\| src[0] != '\'' \|\| src[$-1] != '\'')
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	221 throw new ParseException ("Invalid char: not 'x' or '\\x'");
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	222 T[] t = Utf.toString32 (src[1..$-1]);
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	223 if (t.length == 1)
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	224 return t[0];
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	225 else
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	226 throw new ParseException ("Invalid char: not one character");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	227 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	228
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	229 // Bool
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	230 T deserialize(T : bool) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	231 src = Util.trim(src);
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	232 if (src == "true")
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	233 return true;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	234 if (src == "false")
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	235 return false;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	236 uint pos;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	237 while (src.length > pos && src[pos] == '0') ++pos; // skip leading zeros
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	238 if (src.length == pos && pos > 0)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	239 return false;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	240 if (src.length == pos + 1 && src[pos] == '1')
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	241 return true;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	242 throw new ParseException ("Invalid bool: not true or false and doesn't evaluate to 0 or 1");
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	243 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	244
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	245 // Ints
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	246 T deserialize(T : byte) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	247 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	248 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	249 T deserialize(T : short) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	250 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	251 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	252 T deserialize(T : int) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	253 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	254 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	255 T deserialize(T : long) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	256 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	257 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	258 T deserialize(T : ubyte) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	259 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	260 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	261 T deserialize(T : ushort) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	262 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	263 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	264 T deserialize(T : uint) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	265 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	266 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	267 T deserialize(T : ulong) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	268 return toTInt!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	269 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	270 debug (UnitTest) unittest {
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	271 assert (deserialize!(byte) ("-5") == cast(byte) -5);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	272 // annoyingly, octal syntax differs from D (blame tango):
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	273 assert (deserialize!(uint[]) ("[0b0100,0o724,0xFa59c,0xFFFFFFFF,0]") == [0b0100u,0724,0xFa59c,0xFFFFFFFF,0]);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	274 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	275
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	276 // Floats
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	277 T deserialize(T : float) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	278 return toTFloat!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	279 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	280 T deserialize(T : double) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	281 return toTFloat!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	282 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	283 T deserialize(T : real) (char[] src) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	284 return toTFloat!(T) (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	285 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	286
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	287
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	288 // Structs
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	289 T deserialize(T) (char[] src) {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	290 static assert (is(T == struct), "Unsupported type: "~typeof(T));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	291
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	292 src = Util.trim(src);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	293 if (src.length < 2 \|\| src[0] != '{' \|\| src[$-1] != '}')
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	294 throw new ParseException ("Invalid struct: not { ... }");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	295
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	296 // cannot access elements of T.tupleof with non-const key, so use a type which can be
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	297 // accessed with a non-const key to store slices:
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	298 char[][T.tupleof.length] temp;
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	299 foreach (char[] pair; Split (src[1..$-1])) {
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	300 uint i = 0;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	301 while (i < pair.length) { // advance to the ':'
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	302 char c = pair[i];
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	303 if (c == ':')
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	304 break;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	305 // key must be an int so no need for string checks
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	306 ++i;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	307 }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	308 if (i >= pair.length)
154 0520cc00c0cc Better error reporting for loading translations; avoided an infinite loop. Diggory Hardy <diggory.hardy@gmail.com> parents: 106 diff changeset	309 throw new ParseException ("Invalid KEY:DATA pair within struct: "~pair);
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	310
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	311 size_t k = deserialize!(size_t) (pair[0..i]);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	312 // Note: could check no entry was already stored in temp.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	313 temp[k] = pair[i+1..$];
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	314 }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	315 T ret;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	316 setStruct (ret, temp);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	317 return ret;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	318 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	319 //END deserialize templates
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	320
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	321 //BEGIN Utility funcs
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	322 /** Splits a string into substrings separated by '$(B ,)' with support for characters and strings
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	323 * containing escape sequences and for embedded arrays ($(B [...])).
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	324 *
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	325 * ---
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	326 * foreach (element; Split(src))
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	327 * ...
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	328 * ---
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	329 * Where src is a string to separate on commas. It shouldn't have enclosing brackets.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	330 *
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	331 * Output elements are substrings of src separated by commas, excluding the commas.
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	332 * Not all whitespace is not stripped and empty strings may get returned.
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	333 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	334 * Remarks:
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	335 * This struct is primarily intended for as a utility for use by the templates
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	336 * parsing arrays and associative arrays, but it may be useful in other cases too. Hence the
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	337 * fact no brackets are stripped from src.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	338 */
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	339 struct Split {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	340 static Split opCall (char[] source) {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	341 Split ret;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	342 ret.src = Util.trim (source);
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	343 return ret;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	344 }
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	345
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	346 int opApply(int delegate(ref char[]) dg)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	347 {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	348 if (src == "")
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	349 return 0;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	350
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	351 int result = 0;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	352
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	353 uint depth = 0; // surface depth (embedded arrays)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	354 size_t i = 0, j = 0; // current read location, start of current piece
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	355
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	356 while (i < src.length) {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	357 char c = src[i];
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	358 if (c == '\'' \|\| c == '"') { // string or character
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	359 ++i;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	360 while (i < src.length && src[i] != c) {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	361 if (src[i] == '\\')
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	362 ++i; // escape seq.
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	363 ++i;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	364 } // Doesn't throw if no terminal quote at end of src, but this should be caught later.
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	365 }
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	366 else if (c == '[') ++depth;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	367 else if (c == ']') {
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	368 if (depth)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	369 --depth;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	370 else throw new ParseException ("Invalid array literal: closes before end of data item.");
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	371 }
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	372 else if (c == ',' && depth == 0) { // only if not an embedded array
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	373 char[] t = src[j..i];
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	374 result = dg(t); // add this piece and increment k
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	375 if (result)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	376 return result;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	377 j = i + 1;
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	378 }
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	379 ++i;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	380 }
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	381 if (i > src.length)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	382 throw new ParseException ("Unterminated quote (\' or \")");
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	383
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	384 char[] t = src[j..i];
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	385 result = dg(t); // add final piece (i >= j)
97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	386 return result;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	387 }
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	388
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	389 char[] src;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	390 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	391
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	392 /* Templated read-int function to read (un)signed 1-4 byte integers.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	393 *
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	394 * Actually a reimplementation of tango.text.convert.Integer toLong and parse functions.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	395 */
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	396 private TInt toTInt(TInt) (char[] src) {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	397 const char[] INT_OUT_OF_RANGE = "Integer out of range";
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	398 bool sign;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	399 uint radix, ate, ate2;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	400
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	401 // Trim off whitespace.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	402 // NOTE: Cannot use tango.text.convert.Integer.trim to trim leading whitespace since it doesn't
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	403 // treat new-lines, etc. as whitespace which for our purposes is whitespace.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	404 src = Util.trim (src);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	405
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	406 ate = cInt.trim (src, sign, radix);
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	407 if (ate == src.length)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	408 throw new ParseException ("Invalid integer: no digits");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	409 ulong val = cInt.convert (src[ate..$], radix, &ate2);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	410 ate += ate2;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	411
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	412 if (ate < src.length)
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	413 throw new ParseException ("Invalid integer at marked character: \"" ~ src[0..ate] ~ "'" ~ src[ate] ~ "'" ~ src[ate+1..$] ~ "\"");
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	414
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	415 if (val > TInt.max)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	416 throw new ParseException (INT_OUT_OF_RANGE);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	417 if (sign) {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	418 long sval = cast(long) -val;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	419 if (sval > TInt.min)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	420 return cast(TInt) sval;
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	421 else throw new ParseException (INT_OUT_OF_RANGE);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	422 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	423 return cast(TInt) val;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	424 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	425
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	426 /* Basically a reimplementation of tango.text.convert.Float.toFloat which checks for
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	427 * whitespace before throwing an exception for overlong input. */
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	428 private TFloat toTFloat(TFloat) (char[] src) {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	429 // NOTE: As for toTInt(), this needs to strip leading as well as trailing whitespace.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	430 src = Util.trim (src);
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	431 if (src == "")
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	432 throw new ParseException ("Invalid float: no digits");
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	433 uint ate;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	434
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	435 TFloat x = cFloat.parse (src, &ate);
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	436 return x;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	437 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	438
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	439 /* Throws an exception on invalid escape sequences. Supported escape sequences are the following
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	440 * subset of those supported by D: \" \' \\ \a \b \f \n \r \t \v
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	441 */
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	442 private char unEscapeChar (char c)
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	443 {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	444 // This code was generated:
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	445 if (c <= 'b') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	446 if (c <= '\'') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	447 if (c == '\"') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	448 return '\"';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	449 } else if (c == '\'') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	450 return '\'';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	451 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	452 } else {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	453 if (c == '\\') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	454 return '\\';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	455 } else if (c == 'a') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	456 return '\a';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	457 } else if (c == 'b') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	458 return '\b';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	459 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	460 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	461 } else {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	462 if (c <= 'n') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	463 if (c == 'f') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	464 return '\f';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	465 } else if (c == 'n') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	466 return '\n';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	467 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	468 } else {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	469 if (c == 'r') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	470 return '\r';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	471 } else if (c == 't') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	472 return '\t';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	473 } else if (c == 'v') {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	474 return '\v';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	475 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	476 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	477 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	478
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	479 // if we haven't returned:
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	480 throw new ParseException ("Bad escape sequence: \\"~c);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	481 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	482
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	483 // Reads one hex char: [0-9A-Fa-f]. Otherwise throws an exception. Doesn't check src.length.
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	484 private ubyte readHexChar (char[] src, inout uint pos) {
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	485 ubyte x;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	486 if (src[pos] >= '0' && src[pos] <= '9') x = src[pos] - '0';
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	487 else if (src[pos] >= 'A' && src[pos] <= 'F') x = src[pos] - 'A' + 10;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	488 else if (src[pos] >= 'a' && src[pos] <= 'f') x = src[pos] - 'a' + 10;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	489 else throw new ParseException ("Invalid hex digit.");
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	490 ++pos;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	491 return x;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	492 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	493
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	494 // Generic array reader
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	495 // Assumes input is of form "[xxxxx]" (i.e. first and last chars are '[', ']' and length >= 2).
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	496 private T[] toArray(T : T[]) (char[] src) {
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	497 T[] ret = new T[16]; // avoid unnecessary allocations
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	498 uint i = 0;
89 97e6dce08037 Solved some/removed some obsolete jobs/FIXMEs (excluding from gui code). General cleanup. Diggory Hardy <diggory.hardy@gmail.com> parents: 86 diff changeset	499 foreach (char[] element; Split(src[1..$-1])) {
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	500 if (i == ret.length) ret.length = ret.length * 2;
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	501 ret[i] = deserialize!(T) (element);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	502 ++i;
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	503 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	504 return ret[0..i];
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	505 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	506
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	507 /** Set a struct's elements from an array.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	508 *
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	509 * For a more generic version, see http://www.dsource.org/projects/tutorials/wiki/StructTupleof
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	510 */
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	511 // NOTE: Efficiency? Do recursive calls get inlined?
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	512 private void setStruct(S, size_t N, size_t i = 0) (ref S s, char[][N] src) {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	513 static assert (is(S == struct), "Only to be used with structs.");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	514 static assert (N == S.tupleof.length, "src.length != S.tupleof.length");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	515 static if (i < N) {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	516 if (src[i])
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	517 s.tupleof[i] = deserialize!(typeof(s.tupleof[i])) (src[i]);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	518 setStruct!(S, N, i+1) (s, src);
70 7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	519 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	520 }
7fc0a8295c83 Moved my parseTo and parseFrom modules from tango.scrapple to mde in order to reduce dependencies. Diggory Hardy <diggory.hardy@gmail.com> parents: diff changeset	521 //END Utility funcs
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	522
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	523 debug (mdeUnitTest) {
106 7f7b40fed72b Fix & workaround for tango r4134. Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	524 import tango.math.IEEE; // feqrel
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	525 import tango.util.log.Log : Log, Logger;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	526
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	527 private Logger logger;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	528 static this() {
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	529 logger = Log.getLogger ("mde.file.deserialize");
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	530 }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	531 unittest {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	532 // Utility
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	533 bool throws (void delegate() dg) {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	534 bool r = false;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	535 try {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	536 dg();
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	537 } catch (Exception e) {
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	538 r = true;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	539 }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	540 return r;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	541 }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	542 assert (!throws ({ int i = 5; }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	543 assert (throws ({ throw new Exception ("Test - this exception should be caught"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	544
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	545
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	546 // Associative arrays
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	547 char[][char] X = deserialize!(char[][char]) (`['a':"animal\n", 'b':['b','u','s','\n']]`);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	548 char[][char] Y = ['a':cast(char[])"animal\n", 'b':['b','u','s','\n']];
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	549
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	550 //FIXME: when the compiler's fixed: http://d.puremagic.com/issues/show_bug.cgi?id=1671
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	551 // just assert (X == Y)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	552 assert (X.length == Y.length);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	553 assert (X.keys == Y.keys);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	554 assert (X.values == Y.values);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	555 //X.rehash; Y.rehash; // doesn't make a difference
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	556 //assert (X == Y); // fails (compiler bug)
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	557
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	558 assert (throws ({ deserialize!(int[int]) (`[1:1`); })); // bad brackets
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	559 assert (throws ({ deserialize!(int[char[]]) (`["ab\":1]`); })); // unterminated quote
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	560 assert (throws ({ deserialize!(int[char[]]) (`["abc,\a\b\c":1]`); })); // bad escape seq.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	561 assert (throws ({ deserialize!(int[char[]]) (`["abc"]`); })); // no data
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	562
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	563
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	564 // Arrays
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	565 assert (deserialize!(double[]) (`[1.0,1.0e-10]`) == [1.0, 1.0e-10]);// generic array stuff
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	566 assert (deserialize!(double[]) (`[ ]`) == cast(double[]) []); // empty array
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	567 assert (deserialize!(int[][]) (`[[1],[2,3],[]]`) == [[1],[2,3],[]]);// sub-array
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	568 assert (throws ({ deserialize!(int[]) (`[1,2`); })); // bad brackets
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	569 assert (throws ({ deserialize!(int[][]) (`[[1]]]`); })); // bad brackets
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	570
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	571 // char[] and char conversions, with commas, escape sequences and multichar UTF8 characters:
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	572 assert (deserialize!(char[][]) (`[ ".\"", [',','\''] ,"!\b€" ]`) == [ ".\"".dup, [',','\''] ,"!\b€" ]);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	573 assert (throws ({ deserialize!(char[]) ("\"\\\""); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	574 assert (throws ({ deserialize!(char[]) (`['a'`); })); // bad brackets
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	575
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	576 // wchar[] and dchar[] conversions:
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	577 // The characters were pretty-much pulled at random from unicode tables.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	578 // The last few cause some wierd (display only) effects in my editor.
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	579 assert (deserialize!(wchar[]) ("\"Test string: ¶α؟अกሀ搀\"") == "Test string: ¶α؟अกሀ搀"w);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	580 assert (deserialize!(dchar[]) ("\"Test string: ¶α؟अกሀ搀\"") == "Test string: ¶α؟अกሀ搀"d);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	581
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	582 assert (deserialize!(ubyte[]) (`0x01F2aC`) == cast(ubyte[]) [0x01, 0xF2, 0xAC]); // ubyte[] special notation
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	583 assert (deserialize!(ubyte[]) (`[01 ,0xF2, 0xAC]`) == cast(ubyte[]) [0x01, 0xF2, 0xAC]); // ubyte[] std notation
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	584 assert (throws ({ deserialize!(ubyte[]) (`0x123`); })); // digits not in pairs
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	585 assert (throws ({ deserialize!(ubyte[]) (`[2,5`); })); // not [...] or 0x..
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	586 assert (throws ({ deserialize!(ubyte[]) (`0x123j`); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	587
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	588
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	589 // char types
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	590 assert (deserialize!(char) ("'\\\''") == '\'');
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	591 assert (deserialize!(wchar) ("'X'") == 'X');
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	592 assert (deserialize!(dchar) ("'X'") == 'X');
82 ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	593 assert (deserialize!(wchar) ("'£'") == '£');
ac1e3fd07275 New ssi file format. Diggory Hardy <diggory.hardy@gmail.com> parents: 81 diff changeset	594 assert (deserialize!(dchar) ("'£'") == '£');
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	595 assert (throws ({ deserialize!(char) ("'\\'"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	596 assert (throws ({ deserialize!(char) ("'£'"); })); // non-ascii
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	597 assert (throws ({ deserialize!(char) ("''"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	598 assert (throws ({ deserialize!(char) ("'ab'"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	599 assert (throws ({ deserialize!(wchar) ("''"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	600
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	601
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	602 // bool
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	603 assert (deserialize!(bool[]) (`[true,false,01,00]`) == cast(bool[]) [1,0,1,0]);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	604 assert (throws ({ deserialize!(bool) ("011"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	605
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	606
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	607 // ints
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	608 assert (deserialize!(byte) ("-5") == cast(byte) -5);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	609 assert (deserialize!(int) ("-0x7FFFFFFF") == cast(int) -0x7FFF_FFFF);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	610 // annoyingly, octal syntax differs from D (blame tango):
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	611 assert (deserialize!(uint[]) ("[0b0100,0o724,0xFa59c,0xFFFFFFFF,0]") == [0b0100u,0724,0xFa59c,0xFFFFFFFF,0]);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	612 assert (throws ({ deserialize!(int) (""); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	613 assert (throws ({ deserialize!(int) ("0x8FFFFFFF"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	614 assert (throws ({ deserialize!(uint) ("-1"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	615 assert (throws ({ deserialize!(uint) ("1a"); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	616
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	617
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	618 // floats
106 7f7b40fed72b Fix & workaround for tango r4134. Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	619 assert (feqrel (deserialize!(float) ("0.0"), 0.0f) >= float.mant_dig-1);
7f7b40fed72b Fix & workaround for tango r4134. Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	620 assert (feqrel (deserialize!(double) ("-1e25"), -1e25) >= double.mant_dig-2);
7f7b40fed72b Fix & workaround for tango r4134. Diggory Hardy <diggory.hardy@gmail.com> parents: 89 diff changeset	621 assert (feqrel (deserialize!(real) ("5.24e-269"), cast(real) 5.24e-269) >= real.mant_dig-3);
79 61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	622 assert (throws ({ deserialize!(float) (""); }));
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	623
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	624
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	625 // structs
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	626 struct A { int x = 5; char y; }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	627 struct B { A a; float b; }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	628 A a; a.y = 'y';
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	629 assert (deserialize!(A) ("{ 1 : 'y' }") == a);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	630 B b; b.a = a; b.b = 1.0f;
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	631 assert (deserialize!(B) (" {1:1.0,0: { 1 : 'y' } } ") == b);
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	632 assert (throws ({ deserialize!(A) (" 1:'x'}"); })); // bad braces
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	633 assert (throws ({ deserialize!(A) ("{ 1 }"); })); // no :DATA
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	634
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	635
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	636 // unEscapeChar
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	637 assert (deserialize!(char[]) ("\"\\a\\b\\t\\n\\v\\f\\r\\\"\\\'\\\\\"") == "\a\b\t\n\v\f\r\"\'\\");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	638
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	639 logger.info ("Unittest complete.");
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	640 }
61ea26abe4dd Moved mde/mergetag/parse/parse(To/From) to mde/mergetag/(de)serialize. Implemented (de)serialization of structs. Diggory Hardy <diggory.hardy@gmail.com> parents: 70 diff changeset	641 }

Mercurial > projects > mde

annotate mde/file/deserialize.d @ 154:0520cc00c0cc