Mercurial > projects > ldc
view dmd/cond.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 | b30fe7e1dbb9 |
children |
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_DEBCOND_H #define DMD_DEBCOND_H struct Expression; struct Identifier; struct OutBuffer; struct Module; struct Scope; struct ScopeDsymbol; #ifdef _DH #include "lexer.h" // dmdhg #endif enum TOK; #ifdef _DH struct HdrGenState; #endif int findCondition(Array *ids, Identifier *ident); struct Condition { Loc loc; int inc; // 0: not computed yet // 1: include // 2: do not include Condition(Loc loc); virtual Condition *syntaxCopy() = 0; virtual int include(Scope *sc, ScopeDsymbol *s) = 0; virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs) = 0; }; struct DVCondition : Condition { unsigned level; Identifier *ident; Module *mod; DVCondition(Module *mod, unsigned level, Identifier *ident); Condition *syntaxCopy(); }; struct DebugCondition : DVCondition { static void setGlobalLevel(unsigned level); static void addGlobalIdent(const char *ident); static void addPredefinedGlobalIdent(const char *ident); DebugCondition(Module *mod, unsigned level, Identifier *ident); int include(Scope *sc, ScopeDsymbol *s); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); }; struct VersionCondition : DVCondition { static void setGlobalLevel(unsigned level); static void checkPredefined(Loc loc, const char *ident); static void addGlobalIdent(const char *ident); static void addPredefinedGlobalIdent(const char *ident); VersionCondition(Module *mod, unsigned level, Identifier *ident); int include(Scope *sc, ScopeDsymbol *s); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); }; struct StaticIfCondition : Condition { Expression *exp; StaticIfCondition(Loc loc, Expression *exp); Condition *syntaxCopy(); int include(Scope *sc, ScopeDsymbol *s); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); }; struct IftypeCondition : Condition { /* iftype (targ id tok tspec) */ Type *targ; Identifier *id; // can be NULL enum TOK tok; // ':' or '==' Type *tspec; // can be NULL IftypeCondition(Loc loc, Type *targ, Identifier *id, enum TOK tok, Type *tspec); Condition *syntaxCopy(); int include(Scope *sc, ScopeDsymbol *s); void toCBuffer(OutBuffer *buf, HdrGenState *hgs); }; #endif