Changeset 54

Timestamp:

06/26/08 21:21:29 (4 months ago)

Author:

baxissimo

Message:

Switched array lengths to use packed integers to make the 32/64 bit thing work as long as you don't have your own size_t parameters in your code. Maybe should store all unsigned ints this way?

Files:

• trunk/doost/util/serializer/archive/BinaryArchive.d (modified) (6 diffs)
• trunk/examples/util/serializer/FunctionTest.d (modified) (5 diffs)

trunk/doost/util/serializer/archive/BinaryArchive.d

@@ -208 +208 @@
-            loadNumber(sizeof_length);
-            if (sizeof_length != LengthSizeof) {
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-
@@ -326 +333 @@
-
-    /***************************************************************************
+      Load an unsigned integer value that's stored as a variable number of bytes
+
+      Thanks to Tom S. aka h3r3tic for this.
+     **************************************************************************/
+    bool loadPackedUInteger(VALUE)(ref VALUE value) {
+        static assert(is(VALUE==ubyte)||
+                      is(VALUE==ushort)||
+                      is(VALUE==uint)||
+                      is(VALUE==ulong), "Not an unsigned integer");
+        ulong res = 0;
+        bool cont = true;
+        for (int i = 0; cont; ++i) {
+            ubyte part;
+            part = storage.get();
+            cont = (part & 0b10000000) != 0;
+            res |= (part & 0b01111111) << (i * 7);
+        }
+        // check for overflow
+        if (VALUE.max < res) {
+            value = VALUE.max;
+            return false; 
+        }
+        value = res;
+        
+        return true;
+    }
+
+    /***************************************************************************
+      Save an unsigned integer as a variable number of bytes.
+
+      Thanks to Tom S. aka h3r3tic for this.
+     **************************************************************************/
+    bool dumpPackedUInteger(VALUE)(VALUE value) {
+        static assert(is(VALUE==ubyte)||
+                      is(VALUE==ushort)||
+                      is(VALUE==uint)||
+                      is(VALUE==ulong), "Not an unsigned integer");
+        do {
+            ubyte part = value & 127;
+            if (value > 0b01111111) part |= 0b10000000;
+            value >>= 7;
+            storage.put(part);
+        } while (value != 0);
+
+        return true;
+    }
+
+    /***************************************************************************
-     **************************************************************************/
-    bool loadChar(VALUE)(ref VALUE value) {
@@ -365 +420 @@
-            throw new ParsingException("Array begin marker expected");
-        }
-Element
+PackedUInteger
-            return false;
-        result.length = len;
@@ -387 +442 @@
-    bool dumpArray(VALUE)(ref VALUE value) {
-        storage.put(Marker.arrayBegin);
-storage.put(encode(value.length)
+dumpPackedUInteger(value.length
-
-        foreach(v; value)
@@ -414 +469 @@
-
-
-Element
+PackedUInteger
-            return false;
-        for(size_t i=0; i<len; i++) {
@@ -439 +494 @@
-
-        storage.put(Marker.assocBegin);
-storage.put(encode(value.length)
+dumpPackedUInteger(value.length
-        foreach(k,v; value) {
-            dumpElement(k);

trunk/examples/util/serializer/FunctionTest.d

@@ -18 +18 @@
-import std.date;
-import std.string;
+import math=std.math;
-
-import doost.api.Common;
@@ -1824 +1825 @@
-    input_real = 3.14159_26535_89793_23846_26433_83279_50288_41971_69399;
-    output = binserializer.dump(input_real);
-binserializer.load!(real)(output) == input_real
+math.abs(binserializer.load!(real)(output) - input_real) < 1e-8
-
-    input_cfloat = 1774 + 12.fi;
-    output = binserializer.dump(input_cfloat);
-binserializer.load!(cfloat)(output) == input_cfloat
+math.abs(binserializer.load!(cfloat)(output) - input_cfloat) < 1e-8
-
-    input_creal = 1774 + 12i;
-    output = binserializer.dump(input_creal);
-binserializer.load!(creal)(output) == input_creal
+math.abs(binserializer.load!(creal)(output) - input_creal) < 1e-8
-
-    input_ireal = 1774i;
-    output = binserializer.dump(input_ireal);
-
+
+
-});}
-
@@ -1887 +1889 @@
-});}
-
+
+//------------------------------------------------------------------------------
+unittest { testCase.execute("load/dump - array sizes", {
+    /* Array lengths are saved as a variable length byte sequence
+       so test here that different byte ranges are actually handled properly
+    */
+    int[] input;
+
+    ubyte[] output;
+
+    // 1-byte max is 254
+    for (size_t len=0; len<300; len++) {
+        input.length = len;
+        if (len>0) input[len-1] = len-1;
+
+        output = binserializer.dump(input);
+        assert(binserializer.load!(int[])(output) == input);
+    }
+
+    // 2-byte max is ~65_536
+    int lo = 65_530;
+    int hi = 65_540;
+    input.length = hi; // pre alloc
+    input.length = lo;
+    foreach(i,v; input) { v=i; }
+    for (size_t len=lo; len<hi; len++) {
+        input.length = len;
+        input[len-1] = len-1;
+        output = binserializer.dump(input);
+        assert(binserializer.load!(int[])(output) == input);
+    }
+
+});}
+
+
-//------------------------------------------------------------------------------
-
@@ -1919 +1956 @@
-unittest { testCase.execute("load/dump - static arrays", {
-    string[6] input_string;
-real[3] input_real
+double[3] input_double
-    int[4] input_int;
-    TransparentComposedStruct[3] input_cstruct;
@@ -1935 +1972 @@
-    assert(binserializer.load!(string[6])(output) == input_string);
-
-real[0]=3.14; input_real[0]=2.01; input_real
-real
-real[6])(output) == input_real
+double[0]=3.14; input_double[0]=2.01; input_double
+double
+double[6])(output) == input_double
-
-    input_cstruct[0]=TransparentComposedStruct([1,2,3,4,5]);