Mercurial > projects > ldc
view gen/utils.h @ 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 | ec1d9dc1d32a |
children |
line wrap: on
line source
#ifndef __LDC_GEN_UTILS_H__ #define __LDC_GEN_UTILS_H__ #include "root.h" /// Very simple templated iterator for DMD ArrayS. template<class C> struct ArrayIter { Array* array; size_t index; ArrayIter(Array& arr, size_t idx = 0) : array(&arr), index(idx) { } ArrayIter(Array* arr, size_t idx = 0) : array(arr), index(idx) { assert(arr && "null array"); } ArrayIter<C>& operator=(const Array& arr) { array = &arr; index = 0; return *this; } ArrayIter<C>& operator=(const Array* arr) { assert(arr && "null array"); array = arr; index = 0; return *this; } bool done() { return index >= array->dim; } bool more() { return index < array->dim; } C* get() { return static_cast<C*>(array->data[index]); } C* operator->() { return get(); } C* operator*() { return get(); } void next() { ++index; } bool operator==(const ArrayIter<C>& other) { return &array->data[index] == &other.array->data[other.index]; } }; // some aliases typedef ArrayIter<Dsymbol> DsymbolIter; typedef ArrayIter<FuncDeclaration> FuncDeclarationIter; typedef ArrayIter<VarDeclaration> VarDeclarationIter; #endif