Mercurial > projects > ldc
view tests/mini/dgs.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
extern(C) int printf(char*, ...); struct S { int i; int square() { return i*i; } int plus(int a) { return i + a; } int minus(int a) { return i - a; } int delegate(int) get(char op) { int delegate(int) rval; if (op == '+') rval = + else if (op == '-') rval = − return rval; } } int calldg1(int delegate(int) dg, int i) { return dg(i); } void delegate() retdg() { void delegate() dg; return dg; } void getretdg() { void delegate() dg; dg = retdg(); } class C { int i; void m() { i = 42; } } void getclassdg() { scope c = new C; void delegate() dg = &c.m; assert(c.i != 42); dg(); assert(c.i == 42); } void main() { printf("Delegate test\n"); S s = S(4); auto dg = &s.square; //assert(dg() == 16); //dg(); /*auto dg1 = &s.plus; assert(dg1(6) == 10); auto dg2 = &s.minus; assert(calldg1(dg2,30) == -26); auto dg3 = s.get('+'); assert(dg3(16) == 20); getretdg(); getclassdg();*/ printf(" SUCCESS\n"); }