Mercurial > projects > ldc
annotate tests/mini/d.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 |
| rev | line source |
|---|---|
| 1 | 1 module d; |
| 73 | 2 |
| 1 | 3 void main() |
| 4 { | |
| 5 int delegate() dg; | |
| 6 | |
| 7 struct S | |
| 8 { | |
| 9 int i; | |
| 10 long l; | |
| 11 float f; | |
| 12 | |
| 13 int func() | |
| 14 { | |
| 15 return 42; | |
| 16 } | |
| 17 } | |
| 18 | |
| 19 S s; | |
| 20 auto dg2 = &s.func; | |
| 73 | 21 int i = dg2(); |
| 22 assert(i == 42); | |
| 1 | 23 |
| 24 i = f(dg2, 1); | |
| 73 | 25 assert(i == 43); |
| 1 | 26 } |
| 27 | |
| 28 int f(int delegate() dg, int i) | |
| 29 { | |
| 30 return dg() + i; | |
| 31 } | |
| 32 | |
| 73 | 33 /* |
| 1 | 34 struct S |
| 35 { | |
| 36 int i; | |
| 37 float f; | |
| 38 int square() | |
| 39 { | |
| 40 return i*i; | |
| 41 } | |
| 42 } | |
| 43 | |
| 44 S s; | |
| 45 | |
| 46 void main() | |
| 47 { | |
| 48 auto dg = &s.square; | |
| 49 } | |
| 73 | 50 */ |