annotate tests/mini/structs3.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
7
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
1 module structs3;
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
2
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
3 struct S
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
4 {
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
5 char c;
8
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
6 float f;
7
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
7 }
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
8
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
9 struct T
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
10 {
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
11 S s;
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
12 long l;
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
13 }
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
14
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
15 void main()
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
16 {
8
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
17 T t;
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
18 float f = void;
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
19 float* fp = void;
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
20 {f = t.s.f;}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
21 {t.s.f = 0.0;}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
22 {fp = &t.s.f;}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
23 {*fp = 1.0;}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
24 {assert(t.s.f == 1.0);}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
25 {assert(*(&t.s.f) == 1.0);}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
26 {t.s.c = 'a';}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
27 {assert(t.s.c == 'a');}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
28 {t.l = 64;}
5e69b77a5c51 [svn r12] fixed accessing aggregate fields of aggregates
lindquist
parents: 7
diff changeset
29 {assert(t.l == 64);}
7
7a155ba88c53 [svn r11] added another struct sample
lindquist
parents:
diff changeset
30 }