annotate tests/mini/nested7.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
129
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
1 module nested7;
270
d9d5d59873d8 [svn r291] Fixed a bunch of the old Phobos tests to work with Tango.
lindquist
parents: 129
diff changeset
2 extern(C) int printf(char*, ...);
129
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
3
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
4 void main()
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
5 {
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
6 int i;
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
7 i = 52;
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
8 printf("i = %d\n", i);
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
9
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
10 void func()
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
11 {
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
12 i++;
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
13
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
14 void func2()
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
15 {
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
16 i++;
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
17
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
18 void func3()
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
19 {
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
20 i++;
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
21 }
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
22
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
23 func3();
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
24 }
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
25
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
26 func2();
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
27 }
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
28
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
29 func();
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
30
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
31 printf("i = %d\n", i);
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
32 assert(i == 55);
8096ba7082db [svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff changeset
33 }