Mercurial > projects > ldc
view lphobos/typeinfo2/ti_Along.d @ 1442:0a5f7890f327
Adjust some more code that was depending on the function and delegate calling
conventions being equal.
There's also an instance in `tango.text.convert.Layout` that should be adjusted:
{{{
Index: tango/text/convert/Layout.d
===================================================================
--- tango/text/convert/Layout.d (revision 4578)
+++ tango/text/convert/Layout.d (working copy)
-660,8 +660,12 @@
case TypeCode.STRUCT:
auto s = cast(TypeInfo_Struct) type;
- if (s.xtoString)
- return Utf.fromString8 (s.xtoString(p), result);
+ if (s.xtoString) {
+ char[] delegate() toString;
+ toString.ptr = p;
+ toString.funcptr = cast(char[] function()) s.xtoString;
+ return Utf.fromString8 (toString(), result);
+ }
goto default;
case TypeCode.INTERFACE:
}}}
author | Frits van Bommel <fvbommel wxs.nl> |
---|---|
date | Sun, 31 May 2009 15:27:01 +0200 |
parents | 362825278842 |
children |
line wrap: on
line source
module typeinfo2.ti_Along; extern(C) int memcmp(void*,void*,size_t); // long[] class TypeInfo_Al : TypeInfo { char[] toString() { return "long[]"; } hash_t getHash(void *p) { long[] s = *cast(long[]*)p; size_t len = s.length; auto str = s.ptr; hash_t hash = 0; while (len) { hash *= 9; hash += *cast(uint *)str + *(cast(uint *)str + 1); str++; len--; } return hash; } int equals(void *p1, void *p2) { long[] s1 = *cast(long[]*)p1; long[] s2 = *cast(long[]*)p2; return s1.length == s2.length && memcmp(cast(void *)s1, cast(void *)s2, s1.length * long.sizeof) == 0; } int compare(void *p1, void *p2) { long[] s1 = *cast(long[]*)p1; long[] s2 = *cast(long[]*)p2; size_t len = s1.length; if (s2.length < len) len = s2.length; for (size_t u = 0; u < len; u++) { if (s1[u] < s2[u]) return -1; else if (s1[u] > s2[u]) return 1; } return cast(int)s1.length - cast(int)s2.length; } size_t tsize() { return (long[]).sizeof; } uint flags() { return 1; } TypeInfo next() { return typeid(long); } } // ulong[] class TypeInfo_Am : TypeInfo_Al { char[] toString() { return "ulong[]"; } int compare(void *p1, void *p2) { ulong[] s1 = *cast(ulong[]*)p1; ulong[] s2 = *cast(ulong[]*)p2; size_t len = s1.length; if (s2.length < len) len = s2.length; for (size_t u = 0; u < len; u++) { if (s1[u] < s2[u]) return -1; else if (s1[u] > s2[u]) return 1; } return cast(int)s1.length - cast(int)s2.length; } TypeInfo next() { return typeid(ulong); } }