annotate tests/mini/classes13_bug239.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 9d308feaec27
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1136
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
1 extern(C) int printf(char*, ...);
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
2
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
3 class A {
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
4 bool Afoo = false;
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
5 void foo() { Afoo = true; }
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
6 }
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
7
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
8 class B : A {}
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
9
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
10 class C : B {
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
11 bool Cfoo = false;
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
12 void foo() { Cfoo = true; }
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
13 }
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
14
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
15 void main()
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
16 {
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
17 scope c1 = new C();
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
18 c1.foo();
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
19 assert(c1.Cfoo && !c1.Afoo);
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
20
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
21 scope c2 = new C();
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
22 c2.B.foo();
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
23 assert(!c2.Cfoo && c2.Afoo);
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
24
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
25 scope c3 = new C();
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
26 c3.A.foo();
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
27 assert(!c3.Cfoo && c3.Afoo);
9d308feaec27 Fix #239.
Christian Kamm <kamm incasoftware de>
parents:
diff changeset
28 }