annotate tests/mini/delegate2.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 ce95d269bf5a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
635
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
1 module mini.delegate2;
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
2
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
3 void main()
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
4 {
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
5 int foo = 42;
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
6 int bar()
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
7 {
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
8 return foo;
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
9 }
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
10 int delegate() dg = &bar;
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
11 assert(dg() == foo);
ce95d269bf5a added test case for last commit (taking delegate of nested function of current function)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents:
diff changeset
12 }