Mercurial > projects > ldc
annotate tests/mini/bug9.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 |
|---|---|
| 40 | 1 module bug9; |
|
270
d9d5d59873d8
[svn r291] Fixed a bunch of the old Phobos tests to work with Tango.
lindquist
parents:
40
diff
changeset
|
2 extern(C) int printf(char*, ...); |
|
d9d5d59873d8
[svn r291] Fixed a bunch of the old Phobos tests to work with Tango.
lindquist
parents:
40
diff
changeset
|
3 |
| 40 | 4 struct rgb |
| 5 { | |
| 6 ubyte[3] values; | |
| 7 rgb average(rgb other) | |
| 8 { | |
| 9 rgb res; | |
| 10 foreach (id, ref v; res.values) v=(values[id]+other.values[id])/2; | |
| 11 return res; | |
| 12 } | |
| 13 void print() | |
| 14 { | |
| 15 printf("[%d,%d,%d]\n", values[0], values[1], values[2]); | |
| 16 } | |
| 17 } | |
| 18 | |
| 19 void main() | |
| 20 { | |
| 21 rgb a,b; | |
| 22 a.values[0] = 10; | |
| 23 a.values[1] = 20; | |
| 24 a.values[2] = 30; | |
| 25 b.values[0] = 30; | |
| 26 b.values[1] = 20; | |
| 27 b.values[2] = 10; | |
| 28 rgb avg = a.average(b); | |
| 29 avg.print(); | |
| 30 assert(avg.values[0] == 20); | |
| 31 assert(avg.values[1] == 20); | |
| 32 assert(avg.values[2] == 20); | |
| 33 } | |
| 34 |