Mercurial > projects > ldc
view dmd/enum.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 | e961851fb8be |
children | def7a1d494fd |
line wrap: on
line source
// Compiler implementation of the D programming language // Copyright (c) 1999-2008 by Digital Mars // All Rights Reserved // written by Walter Bright // http://www.digitalmars.com // License for redistribution is by either the Artistic License // in artistic.txt, or the GNU General Public License in gnu.txt. // See the included readme.txt for details. #ifndef DMD_ENUM_H #define DMD_ENUM_H #ifdef __DMC__ #pragma once #endif /* __DMC__ */ #include "root.h" #include "dsymbol.h" struct Identifier; struct Type; struct Expression; #ifdef _DH struct HdrGenState; #endif struct EnumDeclaration : ScopeDsymbol { Type *type; // the TypeEnum Type *memtype; // type of the members #if DMDV1 dinteger_t maxval; dinteger_t minval; dinteger_t defaultval; // default initializer #else Expression *maxval; Expression *minval; Expression *defaultval; // default initializer Scope *scope; // !=NULL means context to use #endif int isdeprecated; EnumDeclaration(Loc loc, Identifier *id, Type *memtype); Dsymbol *syntaxCopy(Dsymbol *s); void semantic(Scope *sc); int oneMember(Dsymbol **ps); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); Type *getType(); const char *kind(); #if DMDV2 Dsymbol *search(Loc, Identifier *ident, int flags); #endif int isDeprecated(); // is Dsymbol deprecated? void emitComment(Scope *sc); void toDocBuffer(OutBuffer *buf); EnumDeclaration *isEnumDeclaration() { return this; } #if IN_DMD void toObjFile(int multiobj); // compile to .obj file void toDebug(); int cvMember(unsigned char *p); Symbol *sinit; Symbol *toInitializer(); #endif #if IN_LLVM void codegen(Ir*); #endif }; struct EnumMember : Dsymbol { Expression *value; EnumMember(Loc loc, Identifier *id, Expression *value); Dsymbol *syntaxCopy(Dsymbol *s); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); const char *kind(); void emitComment(Scope *sc); void toDocBuffer(OutBuffer *buf); EnumMember *isEnumMember() { return this; } }; #endif /* DMD_ENUM_H */