Mercurial > projects > ldc
view ir/irtypestruct.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 | dd135ff697fa |
children |
line wrap: on
line source
#ifndef __LDC_IR_IRTYPESTRUCT_H__ #define __LDC_IR_IRTYPESTRUCT_H__ #include "ir/irtype.h" ////////////////////////////////////////////////////////////////////////////// struct AggregateDeclaration; struct StructDeclaration; struct TypeStruct; ////////////////////////////////////////////////////////////////////////////// class IrTypeAggr : public IrType { public: /// IrTypeAggr(AggregateDeclaration* ad); /// IrTypeAggr* isAggr() { return this; } /// typedef std::vector<VarDeclaration*>::iterator iterator; /// iterator def_begin() { return default_fields.begin(); } /// iterator def_end() { return default_fields.end(); } protected: /// AggregateDeclaration this type represents. AggregateDeclaration* aggr; /// Sorted list of all default fields. /// A default field is a field that contributes to the default initializer /// and the default type, and thus it has it's own unique GEP index into /// the aggregate. /// For classes, field of any super classes are not included. std::vector<VarDeclaration*> default_fields; }; ////////////////////////////////////////////////////////////////////////////// class IrTypeStruct : public IrTypeAggr { public: /// IrTypeStruct(StructDeclaration* sd); /// IrTypeStruct* isStruct() { return this; } /// const llvm::Type* buildType(); protected: /// StructDeclaration this type represents. StructDeclaration* sd; /// DMD TypeStruct of this type. TypeStruct* ts; }; ////////////////////////////////////////////////////////////////////////////// #endif