Mercurial > projects > ldc
comparison tests/mini/vararg6.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 | a9feaed801d7 |
children |
comparison
equal
deleted
inserted
replaced
1441:a3af393d1936 | 1442:0a5f7890f327 |
---|---|
1 // tries to implement a fairly complete variadic print function | 1 // tries to implement a fairly complete variadic print function |
2 module tangotests.vararg3; | 2 module tangotests.vararg6; |
3 | 3 |
4 extern(C) int printf(char*, ...); | 4 extern(C) int printf(char*, ...); |
5 | 5 |
6 struct User | 6 struct User |
7 { | 7 { |
177 | 177 |
178 else if (auto sti = cast(TypeInfo_Struct)ti) | 178 else if (auto sti = cast(TypeInfo_Struct)ti) |
179 { | 179 { |
180 if (sti.xtoString !is null) | 180 if (sti.xtoString !is null) |
181 { | 181 { |
182 char[] str = sti.xtoString(arg); | 182 char[] delegate() toString; |
183 toString.ptr = arg; | |
184 toString.funcptr = sti.xtoString; | |
185 char[] str = toString(); | |
183 printf("%.*s", str.length, str.ptr); | 186 printf("%.*s", str.length, str.ptr); |
184 } | 187 } |
185 else | 188 else |
186 { | 189 { |
187 char[] str = sti.toString(); | 190 char[] str = sti.toString(); |