Changeset 474

Timestamp:

01/04/11 06:58:40 (14 years ago)

Author:

braddr

Message:

Fix aa.keys and aa.values to work on 64 bit.

Files:

• trunk/src/rt/aaA.d (modified) (2 diffs)

trunk/src/rt/aaA.d

@@ -45 +45 @@
-      100_663_319UL,    402_653_189UL,
-    1_610_612_741UL,  4_294_967_291UL,
-//  8_589_934_513UL, 17_179_869_143UL
-];
-
-/* This is the type of the return value for dynamic arrays.
- * It should be a type that is returned in registers.
- * Although DMD will return types of Array in registers,
- * gcc will not, so we instead use a 'long'.
- */
-long
+void[]
-
-struct Array
-{
-    size_t length;
-    void* ptr;
-}
-
-struct aaA
-{
-    aaA *next;
@@ -502 +502 @@
-}
-
-/********************************************
- * Produce array of N byte keys from aa.
- */
-
-ArrayRet_t _aaKeys(AA aa, size_t keysize)
-{
-    auto len = _aaLen(aa);
-    if (!len)
-0
+null
-    auto res = (cast(byte*) gc_malloc(len * keysize,
-                                 !(aa.a.keyti.flags() & 1) ? BlkAttr.NO_SCAN : 0))[0 .. len * keysize];
-    size_t resi = 0;
-    foreach (e; aa.a.b)
-    {
-        while (e)
-        {
-            memcpy(&res[resi * keysize], cast(byte*)(e + 1), keysize);
-            resi++;
-            e = e.next;
-        }
-    }
-    assert(resi == len);
-
-    Array a;
-    a.length = len;
-    a.ptr = res.ptr;
-    return *cast(ArrayRet_t*)(&a);
+}
+
+unittest
+{
+    int[string] aa;
+
+    aa["hello"] = 3;
+    assert(aa["hello"] == 3);
+    aa["hello"]++;
+    assert(aa["hello"] == 4);
+
+    assert(aa.length == 1);
+
+    string[] keys = aa.keys;
+    assert(keys.length == 1);
+    assert(memcmp(keys[0].ptr, cast(char*)"hello", 5) == 0);
+
+    int[] values = aa.values;
+    assert(values.length == 1);
+    assert(values[0] == 4);
+
+    aa.rehash;
+    assert(aa.length == 1);
+    assert(aa["hello"] == 4);
-}
-
-
-/**********************************************
- * 'apply' for associative arrays - to support foreach
- */
-
-// dg is D, but _aaApply() is C
-extern (D) typedef int delegate(void *) dg_t;
-