Mercurial > projects > ldc
annotate tests/mini/bug308_double_finally.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 | f9285cf14c0d |
children |
rev | line source |
---|---|
1413
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
1 extern(C) int printf(char*, ...); |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
2 |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
3 long foo(ref int p) { |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
4 try { return 0; } |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
5 finally { |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
6 p++; |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
7 throw new Object; |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
8 } |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
9 } |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
10 |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
11 void main() { |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
12 int p = 0; |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
13 try { |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
14 foo(p); |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
15 assert(0); |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
16 } catch { |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
17 } |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
18 printf("Number of types scope(exit) was executed : %d\n", p); |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
19 assert(p == 1); |
f9285cf14c0d
Add test from #308 to minitests.
Christian Kamm <kamm incasoftware de>
parents:
diff
changeset
|
20 } |