Mercurial > projects > ldc
view tests/mini/typeinfo10.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 | 1bb99290e03a |
children |
line wrap: on
line source
module typeinfo10; struct S { long l; float f; void* vp; hash_t toHash() { return l + cast(size_t)f; } int opEquals(S s) { return (s.l == l) && (s.f == f); } int opCmp(S a) { if (l == a.l) { return (f < a.f) ? -1 : (f > a.f) ? 1 : 0; } return (l < a.l) ? -1 : 1; } char[] toString() { return "S instance"; } } void main() { S s=S(-1, 0); S t=S(-1, 1); S u=S(11,-1); S v=S(12,13); { assert(s == s); assert(s != t); assert(s != v); assert(s < t); assert(u > s); assert(v > u); } { auto ti = typeid(S); assert(ti.getHash(&s) == s.toHash()); assert(ti.equals(&s,&s)); assert(!ti.equals(&s,&t)); assert(!ti.equals(&s,&v)); assert(ti.compare(&s,&s) == 0); assert(ti.compare(&s,&t) < 0); assert(ti.compare(&u,&s) > 0); assert(ti.compare(&v,&u) > 0); { auto tis = cast(TypeInfo_Struct)ti; char[] delegate() structToString; structToString.ptr = &s; structToString.funcptr = tis.xtoString; assert(structToString() == s.toString()); } } }