Mercurial > projects > ldc
view tests/mini/nested6a.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 | 45a67b6f1310 |
children |
line wrap: on
line source
module nested6a; extern(C) int printf(char*, ...); void main() { int i = 42; printf("main() %d\n", i++); class C { int j; void func() { int k; printf("C.func() %d\n", i++); class C2 { int l; void func2() { printf("in C2.func2()\n"); printf("C2.func2() %d\n", i++); } int m; } { printf("new C2\n"); auto c2 = new C2; printf("C2.func2()\n"); c2.func2(); } int n; } int o; } auto c = new C; c.func(); }