Changeset 3697

Timestamp:

07/02/08 14:51:58 (4 months ago)

Author:

sean

Message:

Rolled back previous changes. I'd have done this a week ago, but dsource was down and then I forgot to commit. This closes #1169

Files:

• trunk/lib/compiler/dmd/adi.d (modified) (4 diffs)
• trunk/lib/compiler/gdc/adi.d (modified) (4 diffs)

trunk/lib/compiler/dmd/adi.d

@@ -378 +378 @@
-extern (C) int _adEq(Array a1, Array a2, TypeInfo ti)
-{
+    /+
+     + TODO: Re-enable once the correct TypeInfo is passed:
+     +       http://d.puremagic.com/issues/show_bug.cgi?id=2161
+     +
-    debug(adi) printf("_adEq(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
-
@@ -389 +393 @@
-        return ti.equals(&a1, &a2);
-    return memcmp(a1.ptr, a2.ptr, a1.length) == 0;
+    +/
+    debug(adi) printf("_adEq(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
+    if (a1.length != a2.length)
+        return 0; // not equal
+    auto sz = ti.tsize();
+    auto p1 = a1.ptr;
+    auto p2 = a2.ptr;
+
+    if (sz == 1)
+        // We should really have a ti.isPOD() check for this
+        return (memcmp(p1, p2, a1.length) == 0);
+
+    for (size_t i = 0; i < a1.length; i++)
+    {
+        if (!ti.equals(p1 + i * sz, p2 + i * sz))
+            return 0; // not equal
+    }
+    return 1; // equal
-}
-
@@ -410 +432 @@
-extern (C) int _adCmp(Array a1, Array a2, TypeInfo ti)
-{
+    /+
+     + TODO: Re-enable once the correct TypeInfo is passed:
+     +       http://d.puremagic.com/issues/show_bug.cgi?id=2161
+     +
-    debug(adi) printf("adCmp()\n");
-
@@ -429 +455 @@
-        return 0;
-    return a1.length > a2.length ? 1 : -1;
+    +/
+    debug(adi) printf("adCmp()\n");
+    auto len = a1.length;
+    if (a2.length < len)
+        len = a2.length;
+    auto sz = ti.tsize();
+    void *p1 = a1.ptr;
+    void *p2 = a2.ptr;
+
+    if (sz == 1)
+    {   // We should really have a ti.isPOD() check for this
+        auto c = memcmp(p1, p2, len);
+        if (c)
+            return c;
+    }
+    else
+    {
+        for (size_t i = 0; i < len; i++)
+        {
+            auto c = ti.compare(p1 + i * sz, p2 + i * sz);
+            if (c)
+                return c;
+        }
+    }
+    if (a1.length == a2.length)
+        return 0;
+    return (a1.length > a2.length) ? 1 : -1;
-}
-

trunk/lib/compiler/gdc/adi.d

@@ -532 +532 @@
-extern (C) int _adEq(Array a1, Array a2, TypeInfo ti)
-{
+    /+
+     + TODO: Re-enable once the correct TypeInfo is passed:
+     +       http://d.puremagic.com/issues/show_bug.cgi?id=2161
+     +
-    debug(adi) printf("_adEq(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
-
@@ -543 +547 @@
-        return ti.equals(&a1, &a2);
-    return memcmp(a1.ptr, a2.ptr, a1.length) == 0;
+    +/
+    debug(adi) printf("_adEq(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
+    if (a1.length != a2.length)
+        return 0; // not equal
+    auto sz = ti.tsize();
+    auto p1 = a1.ptr;
+    auto p2 = a2.ptr;
+
+    if (sz == 1)
+        // We should really have a ti.isPOD() check for this
+        return (memcmp(p1, p2, a1.length) == 0);
+
+    for (size_t i = 0; i < a1.length; i++)
+    {
+        if (!ti.equals(p1 + i * sz, p2 + i * sz))
+            return 0; // not equal
+    }
+    return 1; // equal
-}
-
@@ -564 +586 @@
-extern (C) int _adCmp(Array a1, Array a2, TypeInfo ti)
-{
+    /+
+     + TODO: Re-enable once the correct TypeInfo is passed:
+     +       http://d.puremagic.com/issues/show_bug.cgi?id=2161
+     +
-    debug(adi) printf("adCmp()\n");
-
@@ -583 +609 @@
-        return 0;
-    return a1.length > a2.length ? 1 : -1;
+    +/
+    debug(adi) printf("adCmp()\n");
+    auto len = a1.length;
+    if (a2.length < len)
+        len = a2.length;
+    auto sz = ti.tsize();
+    void *p1 = a1.ptr;
+    void *p2 = a2.ptr;
+
+    if (sz == 1)
+    {   // We should really have a ti.isPOD() check for this
+        auto c = memcmp(p1, p2, len);
+        if (c)
+            return c;
+    }
+    else
+    {
+        for (size_t i = 0; i < len; i++)
+        {
+            auto c = ti.compare(p1 + i * sz, p2 + i * sz);
+            if (c)
+                return c;
+        }
+    }
+    if (a1.length == a2.length)
+        return 0;
+    return (a1.length > a2.length) ? 1 : -1;
-}
-