Changeset 578

Timestamp:

07/17/10 09:29:10 (14 years ago)

Author:

walter

Message:

add attributes to delegate printing

Files:

• trunk/src/mtype.c (modified) (2 diffs)
• trunk/src/mtype.h (modified) (1 diff)

trunk/src/mtype.c

@@ -4726 +4726 @@
-    if (next)
-        next->toCBuffer2(buf, hgs, 0);
-    if (hgs->ddoc != 1)
-    {
-        switch (linkage)
-        {
-            case LINKd:         p = NULL;       break;
-            case LINKc:         p = " C";       break;
-            case LINKwindows:   p = " Windows"; break;
-            case LINKpascal:    p = " Pascal";  break;
-            case LINKcpp:       p = " C++";     break;
-            default:
-                assert(0);
-        }
-    }
-
-    if (!hgs->hdrgen && p)
-        buf->writestring(p);
-    buf->writestring(" function");
-    Parameter::argsToCBuffer(buf, hgs, parameters, varargs);
-
+
+
+
+
+
+
-    /* Use postfix style for attributes
-     */
-    if (mod != this->mod)
-    {
-        modToBuffer(buf);
-    }
-    if (ispure)
-        buf->writestring(" pure");
-    if (isnothrow)
-        buf->writestring(" nothrow");
-    if (isproperty)
-        buf->writestring(" @property");
-    if (isref)
-        buf->writestring(" ref");
-
-    switch (trust)
-    {
-        case TRUSTsystem:
-@system 
+ @system
-            break;
-
-        case TRUSTtrusted:
-            buf->writestring(" @trusted");
-            break;
-
-        case TRUSTsafe:
-            buf->writestring(" @safe");
-            break;
-    }
-    inuse--;
-}
-
-Type *TypeFunction::semantic(Loc loc, Scope *sc)
-{
-    if (deco)                   // if semantic() already run
-    {
-        //printf("already done\n");
-        return this;
-    }
-    //printf("TypeFunction::semantic() this = %p\n", this);
-    //printf("TypeFunction::semantic() %s, sc->stc = %llx, fargs = %p\n", toChars(), sc->stc, fargs);
-
-    /* Copy in order to not mess up original.
-     * This can produce redundant copies if inferring return type,
-     * as semantic() will get called again on this.
-     */
-    TypeFunction *tf = (TypeFunction *)mem.malloc(sizeof(TypeFunction));
-    memcpy(tf, this, sizeof(TypeFunction));
-    if (parameters)
-    {   tf->parameters = (Parameters *)parameters->copy();
@@ -5262 +5266 @@
-    if (this == to)
-        return MATCHexact;
-#if 0 // not allowing covariant conversions because it interferes with overriding
-    if (to->ty == Tdelegate && this->nextOf()->covariant(to->nextOf()) == 1)
-        return MATCHconvert;
-#endif
-    return MATCHnomatch;
-}
-
-void TypeDelegate::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }
-    TypeFunction *tf = (TypeFunction *)next;
-
-    tf->next->toCBuffer2(buf, hgs, 0);
-    buf->writestring(" delegate");
-    Parameter::argsToCBuffer(buf, hgs, tf->parameters, tf->varargs);
+    tf->attributesToCBuffer(buf, mod);
-}
-
-Expression *TypeDelegate::defaultInit(Loc loc)
-{
-#if LOGDEFAULTINIT
-    printf("TypeDelegate::defaultInit() '%s'\n", toChars());
-#endif
-    return new NullExp(loc, this);
-}
-
-int TypeDelegate::isZeroInit(Loc loc)
-{
-    return 1;
-}
-
-int TypeDelegate::checkBoolean()
-{
-    return TRUE;
-}
-

trunk/src/mtype.h

@@ -551 +551 @@
-
-    Parameters *parameters;     // function parameters
-    int varargs;        // 1: T t, ...) style for variable number of arguments
-                        // 2: T t ...) style for variable number of arguments
-    bool isnothrow;     // true: nothrow
-    bool ispure;        // true: pure
-    bool isproperty;    // can be called without parentheses
-    bool isref;         // true: returns a reference
-    enum LINK linkage;  // calling convention
-    enum TRUST trust;   // level of trust
-    Expressions *fargs; // function arguments
-
-    int inuse;
-
-    TypeFunction(Parameters *parameters, Type *treturn, int varargs, enum LINK linkage, StorageClass stc = 0);
-    Type *syntaxCopy();
-    Type *semantic(Loc loc, Scope *sc);
-    void toDecoBuffer(OutBuffer *buf, int flag);
-    void toCBuffer(OutBuffer *buf, Identifier *ident, HdrGenState *hgs);
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
+    void attributesToCBuffer(OutBuffer *buf, int mod);
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Type *reliesOnTident();
-#if CPP_MANGLE
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-    bool parameterEscapes(Parameter *p);
-
-    int callMatch(Expression *ethis, Expressions *toargs, int flag = 0);
-    type *toCtype();
-    enum RET retStyle();
-
-    unsigned totym();
-};
-
-struct TypeDelegate : TypeNext
-{
-    // .next is a TypeFunction
-
-    TypeDelegate(Type *t);