annotate tests/mini/t.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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
1 interface MyInterface
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
2 {
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
3 int func();
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
4 }
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
5
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
6 class MyClass : MyInterface
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
7 {
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
8 int var;
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
9 int func()
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
10 {
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
11 return var;
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
12 }
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
13 }
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
14
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
15 void func1(MyInterface i)
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
16 {
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
17 int delegate() dg = &i.func;
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
18 func2(dg);
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
19 }
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
20
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
21 extern(C) int printf(char*, ...);
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
22
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
23 void func2(int delegate() dg)
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
24 {
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
25 int i = dg();
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
26 printf("%d\n", i);
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
27 }
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
28
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
29 void main()
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
30 {
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
31 auto c = new MyClass;
143
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
32 c.var = 42;
336ec4f4bbb3 [svn r147] tango.io.Console is now working. True this time :) Yay!
lindquist
parents: 138
diff changeset
33 func1(c);
138
aeddd4d533b3 [svn r142] minor fix to dynamic casts.
lindquist
parents:
diff changeset
34 }