Mercurial > projects > ldc

annotate tests/mini/bug33.d @ 1442:0a5f7890f327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
54
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
1 module bug33;
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
2
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
3 extern(C) int memcmp(void*,void*,size_t);
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
4
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
5 private int string_cmp(char[] s1, char[] s2)
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
6 {
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
7 auto len = s1.length;
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
8 if (s2.length < len)
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
9 len = s2.length;
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
10 int result = memcmp(s1.ptr, s2.ptr, len);
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
11 if (result == 0)
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
12 result = cast(int)(cast(ptrdiff_t)s1.length - cast(ptrdiff_t)s2.length);
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
13 return result;
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
14 }
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
15
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
16 struct S
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
17 {
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
18 char[] toString()
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
19 {
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
20 return "S";
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
21 }
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
22 }
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
23
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
24 int func()
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
25 {
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
26 S a,b;
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
27 return string_cmp(a.toString(),b.toString());
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
28 }
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
29
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
30 void main()
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
31 {
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
32 assert(func() == 0);
28e99b04a132 [svn r58] Fixed cond expression resulting in a non-basic type.
lindquist
parents:
diff changeset
33 }