Mercurial > projects > ldc
annotate tests/mini/nested10.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 |
---|---|
129
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
1 module nested10; |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
2 |
273 | 3 extern(C) int printf(char*, ...); |
4 | |
129
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
5 void main() |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
6 { |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
7 int j = 3; |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
8 void F() |
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 int i = j; |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
11 printf("F: i = %d, j = %d\n", i, j); |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
12 void G() |
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 printf("G: i = %d, j = %d\n", i, j); |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
15 j += i; |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
16 } |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
17 G(); |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
18 } |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
19 F(); |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
20 printf("6 = %d\n", j); |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
21 assert(j == 6); |
8096ba7082db
[svn r133] Fixed some problems with inlining not happening :P
lindquist
parents:
diff
changeset
|
22 } |