annotate tests/mini/staticvars.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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
1 module staticvars;
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
2
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
3 int func()
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
4 {
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
5 static int i;
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
6 return i++;
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
7 }
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
8
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
9 void main()
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
10 {
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
11 assert(func() == 0);
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
12 assert(func() == 1);
99737f94abfb [svn r30] * Fixed static function-local variables.
lindquist
parents:
diff changeset
13 }