view tests/mini/bug9.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 bug9;
extern(C) int printf(char*, ...);

struct rgb
{
  ubyte[3] values;
  rgb average(rgb other)
  {
    rgb res;
    foreach (id, ref v; res.values) v=(values[id]+other.values[id])/2;
    return res;
  }
  void print()
  {
    printf("[%d,%d,%d]\n", values[0], values[1], values[2]);
  }
}

void main()
{
    rgb a,b;
    a.values[0] = 10;
    a.values[1] = 20;
    a.values[2] = 30;
    b.values[0] = 30;
    b.values[1] = 20;
    b.values[2] = 10;
    rgb avg = a.average(b);
    avg.print();
    assert(avg.values[0] == 20);
    assert(avg.values[1] == 20);
    assert(avg.values[2] == 20);
}