Changeset 3737

Timestamp:

07/09/08 16:03:20 (5 months ago)

Author:

sean

Message:

Merged in changes from DMD 1.032. These changes have not been applied to GDC because they are new functions which GDC is likely to define differently.

Files:

• trunk/lib/compiler/dmd/adi.d (modified) (4 diffs)
• trunk/lib/compiler/dmd/arraydouble.d (added)
• trunk/lib/compiler/dmd/arrayfloat.d (added)
• trunk/lib/compiler/dmd/arrayreal.d (added)
• trunk/lib/compiler/dmd/util/cpuid.d (added)
• trunk/lib/compiler/dmd/win32.mak (modified) (2 diffs)

trunk/lib/compiler/dmd/adi.d

@@ -374 +374 @@
-/***************************************
- * Support for array equality test.
+ * Returns:
+ *      1       equal
+ *      0       not equal
- */
-
-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);
-
-    if (a1.length != a2.length)
-        return 0; // not equal
-    if (a1.ptr == a2.ptr)
-        return 1; // equal
-
-    // We should really have a ti.isPOD() check for this
-    if (ti.tsize() != 1)
-        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)
@@ -413 +400 @@
-}
-
+extern (C) int _adEq2(Array a1, Array a2, TypeInfo ti)
+{
+    debug(adi) printf("_adEq2(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
+    if (a1.length != a2.length)
+        return 0;               // not equal
+    if (!ti.equals(&a1, &a2))
+        return 0;
+    return 1;
+}
-unittest
-{
@@ -432 +428 @@
-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");
-
-    if (a1.ptr == a2.ptr &&
-        a1.length == a2.length)
-        return 0;
-
-    auto len = a1.length;
-    if (a2.length < len)
-        len = a2.length;
-
-    // We should really have a ti.isPOD() check for this
-    if (ti.tsize() != 1)
-        return ti.compare(&a1, &a2);
-    auto c = memcmp(a1.ptr, a2.ptr, len);
-    if (c)
-        return c;
-    if (a1.length == a2.length)
-        return 0;
-    return a1.length > a2.length ? 1 : -1;
-    +/
-    debug(adi) printf("adCmp()\n");
-    auto len = a1.length;
@@ -484 +456 @@
-}
-
+extern (C) int _adCmp2(Array a1, Array a2, TypeInfo ti)
+{
+    debug(adi) printf("_adCmp2(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
+    return ti.compare(&a1, &a2);
+}
-unittest
-{

trunk/lib/compiler/dmd/win32.mak

@@ -66 +66 @@
-    arraycast.obj \
-    arraycat.obj \
+    arraydouble.obj \
+    arrayfloat.obj \
+    arrayreal.obj \
-    cast.obj \
-    complex.obj \
@@ -89 +92 @@
-OBJ_UTIL= \
-    util\console.obj \
+    util\cpuid.obj \
-    util\ctype.obj \
-    util\string.obj \