Mercurial > projects > ldc
view tests/mini/calls1.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 |
line wrap: on
line source
module calls1; import tango.core.Vararg; extern(C) int printf(char*, ...); void main() { {int a = byVal1(3);} {int a = void; byRef1(a);} {char[] c = void; refType(c);} {char[] c = void; refTypeByRef(c);} {S s = void; structByVal(s);} {S s = void; structByRef(s);} {S s = void; structByPtr(&s);} {printf("c-varargs %d %d %d\n", 1,2,3);} {int i=3; float f=24.7; dvararg(i,f);} {char[] s = "hello"; dvarargRefTy(s);} {char[] ss = "hello world!"; dvarargRefTy(ss);} } int byVal1(int a) { return a; } void byRef1(ref int a) { a = 3; } void refType(char[] s) { } void refTypeByRef(ref char[] s) { } struct S { float f; double d; long l; byte b; } void structByVal(S s) { } void structByRef(ref S s) { } void structByPtr(S* s) { } void dvararg(...) { printf("%d %.1f\n", va_arg!(int)(_argptr), va_arg!(float)(_argptr)); } void dvarargRefTy(...) { char[] s = va_arg!(char[])(_argptr); printf("%.*s\n", s.length, s.ptr); }