annotate tests/mini/classes10.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
117
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
1 module classes10;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
2
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
3 class C
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
4 {
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
5 int i;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
6 override char[] toString()
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
7 {
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
8 return "foobar";
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
9 }
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
10 }
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
11
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
12 void main()
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
13 {
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
14 Object o = new C;
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
15 char[] s = o.toString();
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
16 assert(s == "foobar");
56a21f3e5d3e [svn r121] Finished ModuleInfo implementation.
lindquist
parents:
diff changeset
17 }