Changeset 639

Timestamp:

08/28/10 07:15:45 (14 years ago)

Author:

walter

Message:

Issue 2716 - Confusion of auto and scope as the class attribute

Files:

• branches/dmd-1.x/src/aggregate.h (modified) (1 diff)
• branches/dmd-1.x/src/class.c (modified) (3 diffs)
• branches/dmd-1.x/src/declaration.c (modified) (5 diffs)
• branches/dmd-1.x/src/declaration.h (modified) (2 diffs)
• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• branches/dmd-1.x/src/func.c (modified) (2 diffs)
• branches/dmd-1.x/src/mtype.c (modified) (6 diffs)
• branches/dmd-1.x/src/mtype.h (modified) (2 diffs)
• branches/dmd-1.x/src/statement.c (modified) (4 diffs)
• trunk/src/aggregate.h (modified) (1 diff)
• trunk/src/class.c (modified) (3 diffs)
• trunk/src/clone.c (modified) (1 diff)
• trunk/src/declaration.c (modified) (5 diffs)
• trunk/src/declaration.h (modified) (2 diffs)
• trunk/src/expression.c (modified) (1 diff)
• trunk/src/func.c (modified) (2 diffs)
• trunk/src/mtype.c (modified) (7 diffs)
• trunk/src/mtype.h (modified) (2 diffs)
• trunk/src/statement.c (modified) (4 diffs)

branches/dmd-1.x/src/aggregate.h

@@ -203 +203 @@
-    CtorDeclaration *defaultCtor;       // default constructor
-#endif
-    FuncDeclaration *staticCtor;
-    FuncDeclaration *staticDtor;
-    Array vtbl;                         // Array of FuncDeclaration's making up the vtbl[]
-    Array vtblFinal;                    // More FuncDeclaration's that aren't in vtbl[]
-
-    BaseClasses *baseclasses;           // Array of BaseClass's; first is super,
-                                        // rest are Interface's
-
-    int interfaces_dim;
-    BaseClass **interfaces;             // interfaces[interfaces_dim] for this class
-                                        // (does not include baseClass)
-
-    BaseClasses *vtblInterfaces;        // array of base interfaces that have
-                                        // their own vtbl[]
-
-    ClassInfoDeclaration *vclassinfo;   // the ClassInfo object for this ClassDeclaration
-    int com;                            // !=0 if this is a COM class (meaning
-                                        // it derives from IUnknown)
-auto; 
+scope;
-    int isabstract;                     // !=0 if abstract class
-#if DMDV1
-    int isnested;                       // !=0 if is nested
-    VarDeclaration *vthis;              // 'this' parameter if this class is nested
-#endif
-    int inuse;                          // to prevent recursive attempts
-
-    ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int isBaseOf2(ClassDeclaration *cd);
-
-    #define OFFSET_RUNTIME 0x76543210
-    virtual int isBaseOf(ClassDeclaration *cd, int *poffset);
-
-    virtual int isBaseInfoComplete();
-    Dsymbol *search(Loc, Identifier *ident, int flags);
-#if DMDV2
-    int isFuncHidden(FuncDeclaration *fd);

branches/dmd-1.x/src/class.c

@@ -174 +174 @@
-        if (id == Id::Object)
-        {   if (object)
-                object->error("%s", msg);
-            object = this;
-        }
-
-        if (id == Id::ClassInfo)
-        {   if (classinfo)
-                classinfo->error("%s", msg);
-            classinfo = this;
-        }
-
-        if (id == Id::ModuleInfo)
-        {   if (Module::moduleinfo)
-                Module::moduleinfo->error("%s", msg);
-            Module::moduleinfo = this;
-        }
-    }
-
-    com = 0;
-auto
+scope
-    isabstract = 0;
-    isnested = 0;
-    vthis = NULL;
-    inuse = 0;
-}
-
-Dsymbol *ClassDeclaration::syntaxCopy(Dsymbol *s)
-{
-    ClassDeclaration *cd;
-
-    //printf("ClassDeclaration::syntaxCopy('%s')\n", toChars());
-    if (s)
-        cd = (ClassDeclaration *)s;
-    else
-        cd = new ClassDeclaration(loc, ident, NULL);
-
-    cd->storage_class |= storage_class;
-
-    cd->baseclasses->setDim(this->baseclasses->dim);
-    for (int i = 0; i < cd->baseclasses->dim; i++)
@@ -454 +454 @@
-    }
-
-    interfaces_dim = baseclasses->dim;
-    interfaces = (BaseClass **)baseclasses->data;
-
-
-    if (baseClass)
-    {
-        if (baseClass->storage_class & STCfinal)
-            error("cannot inherit from final class %s", baseClass->toChars());
-
-        interfaces_dim--;
-        interfaces++;
-
-        // Copy vtbl[] from base class
-        vtbl.setDim(baseClass->vtbl.dim);
-        memcpy(vtbl.data, baseClass->vtbl.data, sizeof(void *) * vtbl.dim);
-
-        // Inherit properties from base class
-        com = baseClass->isCOMclass();
-auto = baseClass->isauto
+scope = baseClass->isscope
-        vthis = baseClass->vthis;
-    }
-    else
-    {
-        // No base class, so this is the root of the class hierarchy
-        vtbl.setDim(0);
-        vtbl.push(this);                // leave room for classinfo as first member
-    }
-
-    protection = sc->protection;
-    storage_class |= sc->stc;
-
-    if (sizeok == 0)
-    {
-        interfaceSemantic(sc);
-
-        for (i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = (Dsymbol *)members->data[i];
-            s->addMember(sc, this, 1);
@@ -536 +536 @@
-                    else if (fd)
-                    {   AggregateDeclaration *ad = fd->isMember2();
-                        if (ad)
-                            t = ad->handle;
-                        else
-                        {
-                            t = new TypePointer(Type::tvoid);
-                            t = t->semantic(0, sc);
-                        }
-                    }
-                    else
-                        assert(0);
-                    assert(!vthis);
-                    vthis = new ThisDeclaration(loc, t);
-                    members->push(vthis);
-                }
-            }
-        }
-    }
-
-
-
+
+
+
+
-    if (storage_class & STCabstract)
-        isabstract = 1;
-
-    sc = sc->push(this);
-    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-                 STCabstract | STCdeprecated);
-    sc->parent = this;
-    sc->inunion = 0;
-
-    if (isCOMclass())
-    {
-#if _WIN32
-        sc->linkage = LINKwindows;
-#else
-        /* This enables us to use COM objects under Linux and
-         * work with things like XPCOM
-         */
-        sc->linkage = LINKc;
-#endif
-    }

branches/dmd-1.x/src/declaration.c

@@ -657 +657 @@
-
-VarDeclaration::VarDeclaration(Loc loc, Type *type, Identifier *id, Initializer *init)
-    : Declaration(id)
-{
-    //printf("VarDeclaration('%s')\n", id->toChars());
-#ifdef DEBUG
-    if (!type && !init)
-    {   printf("VarDeclaration('%s')\n", id->toChars());
-        //*(char*)0=0;
-    }
-#endif
-    assert(type || init);
-    this->type = type;
-    this->init = init;
-#ifdef _DH
-    this->htype = NULL;
-    this->hinit = NULL;
-#endif
-    this->loc = loc;
-    offset = 0;
-auto
+scope
-#if DMDV2
-    isargptr = FALSE;
-#endif
-#if DMDV1
-    nestedref = 0;
-#endif
-    ctorinit = 0;
-    aliassym = NULL;
-    onstack = 0;
-    canassign = 0;
-    value = NULL;
-}
-
-Dsymbol *VarDeclaration::syntaxCopy(Dsymbol *s)
-{
-    //printf("VarDeclaration::syntaxCopy(%s)\n", toChars());
-
-    VarDeclaration *sv;
-    if (s)
-    {   sv = (VarDeclaration *)s;
@@ -787 +787 @@
-
-    Type *tb = type->toBasetype();
-    if (tb->ty == Tvoid && !(storage_class & STClazy))
-    {   error("voids have no value");
-        type = Type::terror;
-        tb = type;
-    }
-    if (tb->ty == Tfunction)
-    {   error("cannot be declared to be a function");
-        type = Type::terror;
-        tb = type;
-    }
-    if (tb->ty == Tstruct)
-    {   TypeStruct *ts = (TypeStruct *)tb;
-
-        if (!ts->sym->members)
-        {
-            error("no definition of struct %s", ts->toChars());
-        }
-    }
+    if ((storage_class & STCauto) && !inferred)
+       error("storage class 'auto' has no effect if type is not inferred, did you mean 'scope'?");
-
-    if (tb->ty == Ttuple)
-    {   /* Instead, declare variables for each of the tuple elements
-         * and add those.
-         */
-        TypeTuple *tt = (TypeTuple *)tb;
-        size_t nelems = Parameter::dim(tt->arguments);
-        Objects *exps = new Objects();
-        exps->setDim(nelems);
-        Expression *ie = init ? init->toExpression() : NULL;
-
-        for (size_t i = 0; i < nelems; i++)
-        {   Parameter *arg = Parameter::getNth(tt->arguments, i);
-
-            OutBuffer buf;
-            buf.printf("_%s_field_%zu", ident->toChars(), i);
-            buf.writeByte(0);
-            const char *name = (const char *)buf.extractData();
-            Identifier *id = Lexer::idPool(name);
-
@@ -920 +922 @@
-                ti = ti2;
-            }
-
-            // If it's a member template
-            AggregateDeclaration *ad = ti->tempdecl->isMember();
-            if (ad && storage_class != STCundefined)
-            {
-                error("cannot use template to add field to aggregate '%s'", ad->toChars());
-            }
-        }
-    }
-
-#if DMDV2
-    if ((storage_class & (STCref | STCparameter | STCforeach)) == STCref &&
-        ident != Id::This)
-    {
-        error("only parameters or foreach declarations can be ref");
-    }
-#endif
-
-auto() && !noauto
+scope() && !noscope
-    {
-        if (storage_class & (STCfield | STCout | STCref | STCstatic) || !fd)
-        {
-            error("globals, statics, fields, ref and out parameters cannot be auto");
-        }
-
-(STCauto | STCscope)
+STCscope
-        {
-            if (!(storage_class & STCparameter) && ident != Id::withSym)
-                error("reference to scope class must be scope");
-        }
-    }
-
-    enum TOK op = TOKconstruct;
-    if (!init && !sc->inunion && !isStatic() && !isConst() && fd &&
-        !(storage_class & (STCfield | STCin | STCforeach)) &&
-        type->size() != 0)
-    {
-        // Provide a default initializer
-        //printf("Providing default initializer for '%s'\n", toChars());
-        if (type->ty == Tstruct &&
-            ((TypeStruct *)type)->sym->zeroInit == 1)
-        {   /* If a struct is all zeros, as a special case
-             * set it's initializer to the integer 0.
-             * In AssignExp::toElem(), we check for this and issue
-             * a memset() to initialize the struct.
-             * Must do same check in interpreter.
@@ -1361 +1363 @@
-}
-
-/********************************************
- * Can variable be read and written by CTFE?
- */
-
-int VarDeclaration::isCTFE()
-{
-    //printf("VarDeclaration::isCTFE(%p, '%s')\n", this, toChars());
-    //printf("%llx\n", storage_class);
-    return (storage_class & STCctfe) != 0; // || !isDataseg();
-}
-
-int VarDeclaration::hasPointers()
-{
-    //printf("VarDeclaration::hasPointers() %s, ty = %d\n", toChars(), type->ty);
-    return (!isDataseg() && type->hasPointers());
-}
-
-/******************************************
-n auto
+ scope
- * Otherwise, return NULL.
- */
-
-Auto
+Scope
-{   Expression *e = NULL;
-
-Auto
-auto
+Scope
+scope
-    {
-        for (ClassDeclaration *cd = type->isClassHandle();
-             cd;
-             cd = cd->baseClass)
-        {
-            /* We can do better if there's a way with onstack
-             * classes to determine if there's no way the monitor
-             * could be set.
-             */
-            //if (cd->isInterfaceDeclaration())
-                //error("interface %s cannot be scope", cd->toChars());
-            if (1 || onstack || cd->dtors.dim)  // if any destructors
-            {
-                // delete this;
-                Expression *ec;
-
-                ec = new VarExp(loc, this);
-                e = new DeleteExp(loc, ec);
-                e->type = Type::tvoid;
-                break;
@@ -1575 +1577 @@
-
-TypeInfoDelegateDeclaration::TypeInfoDelegateDeclaration(Type *tinfo)
-    : TypeInfoDeclaration(tinfo, 0)
-{
-}
-
-/***************************** TypeInfoTupleDeclaration **********************/
-
-TypeInfoTupleDeclaration::TypeInfoTupleDeclaration(Type *tinfo)
-    : TypeInfoDeclaration(tinfo, 0)
-{
-}
-
-/********************************* ThisDeclaration ****************************/
-
-// For the "this" parameter to member functions
-
-ThisDeclaration::ThisDeclaration(Loc loc, Type *t)
-   : VarDeclaration(loc, t, Id::This, NULL)
-{
-auto
+scope
-}
-
-Dsymbol *ThisDeclaration::syntaxCopy(Dsymbol *s)
-{
-    assert(0);          // should never be produced by syntax
-    return NULL;
-}
-

branches/dmd-1.x/src/declaration.h

@@ -124 +124 @@
-    void checkModify(Loc loc, Scope *sc, Type *t);
-
-    void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
-    void toDocBuffer(OutBuffer *buf);
-
-    char *mangle();
-    int isStatic() { return storage_class & STCstatic; }
-    virtual int isStaticConstructor();
-    virtual int isStaticDestructor();
-    virtual int isDelete();
-    virtual int isDataseg();
-    virtual int isThreadlocal();
-    virtual int isCodeseg();
-    int isCtorinit()     { return storage_class & STCctorinit; }
-    int isFinal()        { return storage_class & STCfinal; }
-    int isAbstract()     { return storage_class & STCabstract; }
-    int isConst()        { return storage_class & STCconst; }
-    int isImmutable()    { return storage_class & STCimmutable; }
-    int isAuto()         { return storage_class & STCauto; }
-(STCscope | STCauto)
+STCscope
-    int isSynchronized() { return storage_class & STCsynchronized; }
-    int isParameter()    { return storage_class & STCparameter; }
-    int isDeprecated()   { return storage_class & STCdeprecated; }
-    int isOverride()     { return storage_class & STCoverride; }
-
-    int isIn()    { return storage_class & STCin; }
-    int isOut()   { return storage_class & STCout; }
-    int isRef()   { return storage_class & STCref; }
-
-    enum PROT prot();
-
-    Declaration *isDeclaration() { return this; }
-};
-
-/**************************************************************/
-
-struct TupleDeclaration : Declaration
-{
-    Objects *objects;
-    int isexp;                  // 1: expression tuple
@@ -226 +226 @@
-    const char *kind();
-    Type *getType();
-    Dsymbol *toAlias();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-#ifdef _DH
-    Type *htype;
-    Dsymbol *haliassym;
-#endif
-
-    void toDocBuffer(OutBuffer *buf);
-
-    AliasDeclaration *isAliasDeclaration() { return this; }
-};
-
-/**************************************************************/
-
-struct VarDeclaration : Declaration
-{
-    Initializer *init;
-    unsigned offset;
-auto
+scope
-#if DMDV2
-    FuncDeclarations nestedrefs; // referenced by these lexically nested functions
-    bool isargptr;              // if parameter that _argptr points to
-#else
-    int nestedref;              // referenced by a lexically nested function
-#endif
-    int ctorinit;               // it has been initialized in a ctor
-    int onstack;                // 1: it has been allocated on the stack
-                                // 2: on stack, run destructor anyway
-    int canassign;              // it can be assigned to
-    Dsymbol *aliassym;          // if redone as alias to another symbol
-    Expression *value;          // when interpreting, this is the value
-                                // (NULL if value not determinable)
-#if DMDV2
-    VarDeclaration *rundtor;    // if !NULL, rundtor is tested at runtime to see
-                                // if the destructor should be run. Used to prevent
-                                // dtor calls on postblitted vars
-#endif
-
-    VarDeclaration(Loc loc, Type *t, Identifier *id, Initializer *init);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    const char *kind();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-#ifdef _DH
-    Type *htype;
-    Initializer *hinit;
-#endif
-    int needThis();
-    int isImportedSymbol();
-    int isDataseg();
-    int isThreadlocal();
-    int isCTFE();
-    int hasPointers();
-#if DMDV2
-    int canTakeAddressOf();
-    int needsAutoDtor();
-#endif
-Auto
+Scope
-    ExpInitializer *getExpInitializer();
-    Expression *getConstInitializer();
-    void checkCtorConstInit();
-    void checkNestedReference(Scope *sc, Loc loc);
-    Dsymbol *toAlias();
-
-    Symbol *toSymbol();
-    void toObjFile(int multiobj);                       // compile to .obj file
-    int cvMember(unsigned char *p);
-
-    // Eliminate need for dynamic_cast
-    VarDeclaration *isVarDeclaration() { return (VarDeclaration *)this; }
-};
-
-/**************************************************************/
-
-// This is a shell around a back end symbol
-
-struct SymbolDeclaration : Declaration
-{

branches/dmd-1.x/src/expression.c

@@ -3990 +3990 @@
-}
-
-char *VarExp::toChars()
-{
-    return var->toChars();
-}
-
-void VarExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring(var->toChars());
-}
-
-void VarExp::checkEscape()
-{
-    VarDeclaration *v = var->isVarDeclaration();
-    if (v)
-    {   Type *tb = v->type->toBasetype();
-        // if reference type
-        if (tb->ty == Tarray || tb->ty == Tsarray || tb->ty == Tclass)
-        {
-(v->isAuto() || v->isScope()) && !v->noauto
+v->isScope() && !v->noscope
-                error("escaping reference to auto local %s", v->toChars());
-            else if (v->storage_class & STCvariadic)
-                error("escaping reference to variadic parameter %s", v->toChars());
-        }
-    }
-}
-
-void VarExp::checkEscapeRef()
-{
-    VarDeclaration *v = var->isVarDeclaration();
-    if (v)
-    {
-        if (!v->isDataseg() && !(v->storage_class & (STCref | STCout)))
-            error("escaping reference to local variable %s", v->toChars());
-    }
-}
-
-#if DMDV2
-int VarExp::isLvalue()
-{

branches/dmd-1.x/src/func.c

@@ -940 +940 @@
-            if (type->nextOf()->ty == Tvoid)
-            {
-                if (outId)
-                    error("void functions have no result");
-            }
-            else
-            {
-                if (!outId)
-                    outId = Id::result;         // provide a default
-            }
-
-            if (outId)
-            {   // Declare result variable
-                VarDeclaration *v;
-                Loc loc = this->loc;
-
-                if (fensure)
-                    loc = fensure->loc;
-
-                v = new VarDeclaration(loc, type->nextOf(), outId, NULL);
-auto
+scope
-#if DMDV2
-                if (!isVirtual())
-                    v->storage_class |= STCconst;
-                if (f->isref)
-                {
-                    v->storage_class |= STCref | STCforeach;
-                }
-#endif
-                sc2->incontract--;
-                v->semantic(sc2);
-                sc2->incontract++;
-                if (!sc2->insert(v))
-                    error("out result %s is already defined", v->toChars());
-                v->parent = this;
-                vresult = v;
-
-                // vresult gets initialized with the function return value
-                // in ReturnStatement::semantic()
-            }
-
@@ -1350 +1350 @@
-
-            fbody = new CompoundStatement(0, a);
-#if DMDV2
-            /* Append destructor calls for parameters as finally blocks.
-             */
-            if (parameters)
-            {   for (size_t i = 0; i < parameters->dim; i++)
-                {
-                    VarDeclaration *v = (VarDeclaration *)parameters->data[i];
-
-                    if (v->storage_class & (STCref | STCout))
-                        continue;
-
-                    /* Don't do this for static arrays, since static
-                     * arrays are called by reference. Remove this
-                     * when we change them to call by value.
-                     */
-                    if (v->type->toBasetype()->ty == Tsarray)
-                        continue;
-
-Auto
+Scope
-                    if (e)
-                    {   Statement *s = new ExpStatement(0, e);
-                        s = s->semantic(sc);
-                        if (fbody->blockExit() == BEfallthru)
-                            fbody = new CompoundStatement(0, fbody, s);
-                        else
-                            fbody = new TryFinallyStatement(0, fbody, s);
-                    }
-                }
-            }
-#endif
-
-#if 1
-            if (isSynchronized())
-            {   /* Wrap the entire function body in a synchronized statement
-                 */
-                ClassDeclaration *cd = parent->isClassDeclaration();
-                if (cd)
-                {
-#if TARGET_WINDOS

branches/dmd-1.x/src/mtype.c

@@ -487 +487 @@
-int Type::iscomplex()
-{
-    return FALSE;
-}
-
-int Type::isscalar()
-{
-    return FALSE;
-}
-
-int Type::isunsigned()
-{
-    return FALSE;
-}
-
-ClassDeclaration *Type::isClassHandle()
-{
-    return NULL;
-}
-
-auto
+scope
-{
-    return FALSE;
-}
-
-int Type::isString()
-{
-    return FALSE;
-}
-
-int Type::checkBoolean()
-{
-    return isscalar();
-}
-
-/*********************************
- * Check type to see if it is based on a deprecated symbol.
- */
-
-void Type::checkDeprecated(Loc loc, Scope *sc)
-{
@@ -1910 +1910 @@
-    {
-        case Ttuple:
-        {   // Index the tuple to get the type
-            assert(dim);
-            TypeTuple *tt = (TypeTuple *)tbn;
-            uinteger_t d = dim->toUInteger();
-
-            if (d >= tt->arguments->dim)
-            {   error(loc, "tuple index %ju exceeds %u", d, tt->arguments->dim);
-                return Type::terror;
-            }
-            Parameter *arg = (Parameter *)tt->arguments->data[(size_t)d];
-            return arg->type;
-        }
-        case Tfunction:
-        case Tnone:
-            error(loc, "can't have array of %s", tbn->toChars());
-            tbn = next = tint32;
-            break;
-    }
-auto
+scope
-        error(loc, "cannot have array of auto %s", tbn->toChars());
-    return merge();
-}
-
-void TypeSArray::toDecoBuffer(OutBuffer *buf)
-{
-    buf->writeByte(mangleChar[ty]);
-    if (dim)
-        buf->printf("%ju", dim->toInteger());
-    if (next)
-        next->toDecoBuffer(buf);
-}
-
-void TypeSArray::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }
-    next->toCBuffer2(buf, hgs, this->mod);
@@ -2088 +2088 @@
-{
-    // A DArray consists of two ptr-sized values, so align it on pointer size
-    // boundary
-    return PTRSIZE;
-}
-
-Type *TypeDArray::semantic(Loc loc, Scope *sc)
-{   Type *tn = next;
-
-    tn = next->semantic(loc,sc);
-    Type *tbn = tn->toBasetype();
-    switch (tbn->ty)
-    {
-        case Tfunction:
-        case Tnone:
-        case Ttuple:
-            error(loc, "can't have array of %s", tbn->toChars());
-            tn = next = tint32;
-            break;
-    }
-auto
-auto
+scope
+scope
-    if (next != tn)
-        //deco = NULL;                  // redo
-        return tn->arrayOf();
-    return merge();
-}
-
-void TypeDArray::toDecoBuffer(OutBuffer *buf)
-{
-    buf->writeByte(mangleChar[ty]);
-    if (next)
-        next->toDecoBuffer(buf);
-}
-
-void TypeDArray::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }
-    next->toCBuffer2(buf, hgs, this->mod);
@@ -2285 +2285 @@
-            key = key->next->arrayOf();
-#endif
-            break;
-        case Tbit:
-        case Tbool:
-        case Tfunction:
-        case Tvoid:
-        case Tnone:
-        case Ttuple:
-            error(loc, "can't have associative array key of %s", key->toChars());
-            break;
-    }
-    next = next->semantic(loc,sc);
-    switch (next->toBasetype()->ty)
-    {
-        case Tfunction:
-        case Tnone:
-            error(loc, "can't have associative array of %s", next->toChars());
-            break;
-    }
-auto
+scope
-        error(loc, "cannot have array of auto %s", next->toChars());
-
-    return merge();
-}
-
-void TypeAArray::resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps)
-{
-    //printf("TypeAArray::resolve() %s\n", toChars());
-
-    // Deal with the case where we thought the index was a type, but
-    // in reality it was an expression.
-    if (index->ty == Tident || index->ty == Tinstance || index->ty == Tsarray)
-    {
-        Expression *e;
-        Type *t;
-        Dsymbol *s;
-
-        index->resolve(loc, sc, &e, &t, &s);
-        if (e)
-        {   // It was an expression -
@@ -2855 +2855 @@
-    }
-
-    tf->linkage = sc->linkage;
-    if (tf->next)
-    {
-        tf->next = tf->next->semantic(loc,sc);
-#if !SARRAYVALUE
-        if (tf->next->toBasetype()->ty == Tsarray)
-        {   error(loc, "functions cannot return static array %s", tf->next->toChars());
-            tf->next = Type::terror;
-        }
-#endif
-        if (tf->next->toBasetype()->ty == Tfunction)
-        {   error(loc, "functions cannot return a function");
-            tf->next = Type::terror;
-        }
-        if (tf->next->toBasetype()->ty == Ttuple)
-        {   error(loc, "functions cannot return a tuple");
-            tf->next = Type::terror;
-        }
-auto
-auto
+scope
+scope
-    }
-
-    if (tf->parameters)
-    {
-        /* Create a scope for evaluating the default arguments for the parameters
-         */
-        Scope *argsc = sc->push();
-        argsc->stc = 0;                 // don't inherit storage class
-        argsc->protection = PROTpublic;
-
-        size_t dim = Parameter::dim(tf->parameters);
-        for (size_t i = 0; i < dim; i++)
-        {   Parameter *fparam = Parameter::getNth(tf->parameters, i);
-
-            tf->inuse++;
-            fparam->type = fparam->type->semantic(loc, argsc);
-            if (tf->inuse == 1) tf->inuse--;
-
-            Type *t = fparam->type->toBasetype();
-
@@ -4995 +4995 @@
-    if (d->parent && d->toParent()->isModule())
-    {
-        // (e, d)
-        VarExp *ve;
-
-        ve = new VarExp(e->loc, d);
-        e = new CommaExp(e->loc, e, ve);
-        e->type = d->type;
-        return e;
-    }
-
-    de = new DotVarExp(e->loc, e, d);
-    return de->semantic(sc);
-}
-
-ClassDeclaration *TypeClass::isClassHandle()
-{
-    return sym;
-}
-
-auto
-
-auto
+scope
+
+scope
-}
-
-int TypeClass::isBaseOf(Type *t, int *poffset)
-{
-    if (t->ty == Tclass)
-    {   ClassDeclaration *cd;
-
-        cd   = ((TypeClass *)t)->sym;
-        if (sym->isBaseOf(cd, poffset))
-            return 1;
-    }
-    return 0;
-}
-
-MATCH TypeClass::implicitConvTo(Type *to)
-{
-    //printf("TypeClass::implicitConvTo('%s')\n", to->toChars());
-    if (this == to)
-        return MATCHexact;
-

branches/dmd-1.x/src/mtype.h

@@ -200 +200 @@
-    static char needThisPrefix();
-    static void init();
-    d_uns64 size();
-    virtual d_uns64 size(Loc loc);
-    virtual unsigned alignsize();
-    virtual Type *semantic(Loc loc, Scope *sc);
-    virtual void toDecoBuffer(OutBuffer *buf);
-    Type *merge();
-    Type *merge2();
-    virtual void toCBuffer(OutBuffer *buf, Identifier *ident, HdrGenState *hgs);
-    virtual void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    void toCBuffer3(OutBuffer *buf, HdrGenState *hgs, int mod);
-    virtual int isbit();
-    virtual int isintegral();
-    virtual int isfloating();   // real, imaginary, or complex
-    virtual int isreal();
-    virtual int isimaginary();
-    virtual int iscomplex();
-    virtual int isscalar();
-    virtual int isunsigned();
-auto
+scope
-    virtual int isString();
-    virtual int checkBoolean(); // if can be converted to boolean value
-    void checkDeprecated(Loc loc, Scope *sc);
-    Type *pointerTo();
-    Type *referenceTo();
-    Type *arrayOf();
-    virtual Dsymbol *toDsymbol(Scope *sc);
-    virtual Type *toBasetype();
-    virtual int isBaseOf(Type *t, int *poffset);
-    virtual MATCH implicitConvTo(Type *to);
-    virtual ClassDeclaration *isClassHandle();
-    virtual Expression *getProperty(Loc loc, Identifier *ident);
-    virtual Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    virtual unsigned memalign(unsigned salign);
-    virtual Expression *defaultInit(Loc loc = 0);
-    virtual Expression *defaultInitLiteral(Loc loc = 0);
-    virtual int isZeroInit(Loc loc = 0);                // if initializer is 0
-    virtual dt_t **toDt(dt_t **pdt);
-    Identifier *getTypeInfoIdent(int internal);
-    virtual MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
@@ -654 +654 @@
-
-struct TypeClass : Type
-{
-    ClassDeclaration *sym;
-
-    TypeClass(ClassDeclaration *sym);
-    d_uns64 size(Loc loc);
-    char *toChars();
-    Type *syntaxCopy();
-    Type *semantic(Loc loc, Scope *sc);
-    Dsymbol *toDsymbol(Scope *sc);
-    void toDecoBuffer(OutBuffer *buf);
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    ClassDeclaration *isClassHandle();
-    int isBaseOf(Type *t, int *poffset);
-    MATCH implicitConvTo(Type *to);
-    Expression *defaultInit(Loc loc);
-    int isZeroInit(Loc loc);
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-auto
+scope
-    int checkBoolean();
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    int hasPointers();
-    int builtinTypeInfo();
-#if DMDV2
-    Type *toHeadMutable();
-    MATCH constConv(Type *to);
-#if CPP_MANGLE
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-#endif
-
-    type *toCtype();
-
-    Symbol *toSymbol();
-};
-
-struct TypeTuple : Type
-{
-    Parameters *arguments;      // types making up the tuple

branches/dmd-1.x/src/statement.c

@@ -353 +353 @@
-}
-
-void DeclarationStatement::scopeCode(Scope *sc, Statement **sentry, Statement **sexception, Statement **sfinally)
-{
-    //printf("DeclarationStatement::scopeCode()\n");
-    //print();
-
-    *sentry = NULL;
-    *sexception = NULL;
-    *sfinally = NULL;
-
-    if (exp)
-    {
-        if (exp->op == TOKdeclaration)
-        {
-            DeclarationExp *de = (DeclarationExp *)(exp);
-            VarDeclaration *v = de->declaration->isVarDeclaration();
-            if (v)
-            {   Expression *e;
-
-Auto
+Scope
-                if (e)
-                {
-                    //printf("dtor is: "); e->print();
-                    *sfinally = new ExpStatement(loc, e);
-                }
-            }
-        }
-    }
-}
-
-void DeclarationStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    exp->toCBuffer(buf, hgs);
-}
-
-
-/******************************** CompoundStatement ***************************/
-
-CompoundStatement::CompoundStatement(Loc loc, Statements *s)
-    : Statement(loc)
@@ -1678 +1678 @@
-            printf("increment: %s\n", increment->toChars());
-            printf("body: %s\n", body->toChars());
-#endif
-            s = s->semantic(sc);
-            break;
-        }
-#endif
-        case Tdelegate:
-        Lapply:
-        {
-            Expression *ec;
-            Expression *e;
-            Parameter *a;
-
-            Type *tret = func->type->nextOf();
-
-            // Need a variable to hold value from any return statements in body.
-            if (!sc->func->vresult && tret && tret != Type::tvoid)
-            {
-                VarDeclaration *v = new VarDeclaration(loc, tret, Id::result, NULL);
-auto
+scope
-                v->semantic(sc);
-                if (!sc->insert(v))
-                    assert(0);
-                v->parent = sc->func;
-                sc->func->vresult = v;
-            }
-
-            /* Turn body into the function literal:
-             *  int delegate(ref T arg) { body }
-             */
-            Parameters *args = new Parameters();
-            for (size_t i = 0; i < dim; i++)
-            {   Parameter *arg = (Parameter *)arguments->data[i];
-                Identifier *id;
-
-                arg->type = arg->type->semantic(loc, sc);
-                if (arg->storageClass & STCref)
-                    id = arg->ident;
-                else
-                {   // Make a copy of the ref argument so it isn't
@@ -2206 +2206 @@
-    // If we can short-circuit evaluate the if statement, don't do the
-    // semantic analysis of the skipped code.
-    // This feature allows a limited form of conditional compilation.
-    condition = condition->optimize(WANTflags);
-
-    // Evaluate at runtime
-    unsigned cs0 = sc->callSuper;
-    unsigned cs1;
-
-    Scope *scd;
-    if (arg)
-    {   /* Declare arg, which we will set to be the
-         * result of condition.
-         */
-        ScopeDsymbol *sym = new ScopeDsymbol();
-        sym->parent = sc->scopesym;
-        scd = sc->push(sym);
-
-        Type *t = arg->type ? arg->type : condition->type;
-        match = new VarDeclaration(loc, t, arg->ident, NULL);
-auto
+scope
-        match->semantic(scd);
-        if (!scd->insert(match))
-            assert(0);
-        match->parent = sc->func;
-
-        /* Generate:
-         *  (arg = condition)
-         */
-        VarExp *v = new VarExp(0, match);
-        condition = new AssignExp(loc, v, condition);
-        condition = condition->semantic(scd);
-    }
-    else
-        scd = sc->push();
-    ifbody = ifbody->semanticNoScope(scd);
-    scd->pop();
-
-    cs1 = sc->callSuper;
-    sc->callSuper = cs0;
-    if (elsebody)
@@ -3280 +3280 @@
-            sc->fes->cases->push(this);
-            // Construct: return cases->dim+1;
-            s = new ReturnStatement(0, new IntegerExp(sc->fes->cases->dim + 1));
-        }
-        else if (fd->type->nextOf()->toBasetype() == Type::tvoid)
-        {
-            s = new ReturnStatement(0, NULL);
-            sc->fes->cases->push(s);
-
-            // Construct: { exp; return cases->dim + 1; }
-            Statement *s1 = new ExpStatement(loc, exp);
-            Statement *s2 = new ReturnStatement(0, new IntegerExp(sc->fes->cases->dim + 1));
-            s = new CompoundStatement(loc, s1, s2);
-        }
-        else
-        {
-            // Construct: return vresult;
-            if (!fd->vresult)
-            {   // Declare vresult
-                VarDeclaration *v = new VarDeclaration(loc, tret, Id::result, NULL);
-auto
+scope
-                v->semantic(scx);
-                if (!scx->insert(v))
-                    assert(0);
-                v->parent = fd;
-                fd->vresult = v;
-            }
-
-            s = new ReturnStatement(0, new VarExp(0, fd->vresult));
-            sc->fes->cases->push(s);
-
-            // Construct: { vresult = exp; return cases->dim + 1; }
-            exp = new ConstructExp(loc, new VarExp(0, fd->vresult), exp);
-            exp = exp->semantic(sc);
-            Statement *s1 = new ExpStatement(loc, exp);
-            Statement *s2 = new ReturnStatement(0, new IntegerExp(sc->fes->cases->dim + 1));
-            s = new CompoundStatement(loc, s1, s2);
-        }
-        return s;
-    }
-

trunk/src/aggregate.h

@@ -206 +206 @@
-    CtorDeclaration *defaultCtor;       // default constructor
-#endif
-    FuncDeclaration *staticCtor;
-    FuncDeclaration *staticDtor;
-    Array vtbl;                         // Array of FuncDeclaration's making up the vtbl[]
-    Array vtblFinal;                    // More FuncDeclaration's that aren't in vtbl[]
-
-    BaseClasses *baseclasses;           // Array of BaseClass's; first is super,
-                                        // rest are Interface's
-
-    int interfaces_dim;
-    BaseClass **interfaces;             // interfaces[interfaces_dim] for this class
-                                        // (does not include baseClass)
-
-    BaseClasses *vtblInterfaces;        // array of base interfaces that have
-                                        // their own vtbl[]
-
-    TypeInfoClassDeclaration *vclassinfo;       // the ClassInfo object for this ClassDeclaration
-    int com;                            // !=0 if this is a COM class (meaning
-                                        // it derives from IUnknown)
-auto
+scope
-    int isabstract;                     // !=0 if abstract class
-#if DMDV1
-    int isnested;                       // !=0 if is nested
-    VarDeclaration *vthis;              // 'this' parameter if this class is nested
-#endif
-    int inuse;                          // to prevent recursive attempts
-
-    ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int isBaseOf2(ClassDeclaration *cd);
-
-    #define OFFSET_RUNTIME 0x76543210
-    virtual int isBaseOf(ClassDeclaration *cd, int *poffset);
-
-    virtual int isBaseInfoComplete();
-    Dsymbol *search(Loc, Identifier *ident, int flags);
-#if DMDV2
-    int isFuncHidden(FuncDeclaration *fd);

trunk/src/class.c

@@ -179 +179 @@
-        {   if (object)
-                object->error("%s", msg);
-            object = this;
-        }
-
-        //if (id == Id::ClassInfo)
-        if (id == Id::TypeInfo_Class)
-        {   if (classinfo)
-                classinfo->error("%s", msg);
-            classinfo = this;
-        }
-
-        if (id == Id::ModuleInfo)
-        {   if (Module::moduleinfo)
-                Module::moduleinfo->error("%s", msg);
-            Module::moduleinfo = this;
-        }
-    }
-
-    com = 0;
-auto
+scope
-    isabstract = 0;
-    inuse = 0;
-}
-
-Dsymbol *ClassDeclaration::syntaxCopy(Dsymbol *s)
-{
-    ClassDeclaration *cd;
-
-    //printf("ClassDeclaration::syntaxCopy('%s')\n", toChars());
-    if (s)
-        cd = (ClassDeclaration *)s;
-    else
-        cd = new ClassDeclaration(loc, ident, NULL);
-
-    cd->storage_class |= storage_class;
-
-    cd->baseclasses->setDim(this->baseclasses->dim);
-    for (int i = 0; i < cd->baseclasses->dim; i++)
-    {
-        BaseClass *b = (BaseClass *)this->baseclasses->data[i];
@@ -462 +462 @@
-    }
-
-    interfaces_dim = baseclasses->dim;
-    interfaces = (BaseClass **)baseclasses->data;
-
-
-    if (baseClass)
-    {
-        if (baseClass->storage_class & STCfinal)
-            error("cannot inherit from final class %s", baseClass->toChars());
-
-        interfaces_dim--;
-        interfaces++;
-
-        // Copy vtbl[] from base class
-        vtbl.setDim(baseClass->vtbl.dim);
-        memcpy(vtbl.data, baseClass->vtbl.data, sizeof(void *) * vtbl.dim);
-
-        // Inherit properties from base class
-        com = baseClass->isCOMclass();
-auto = baseClass->isauto
+scope = baseClass->isscope
-        vthis = baseClass->vthis;
-        storage_class |= baseClass->storage_class & STC_TYPECTOR;
-    }
-    else
-    {
-        // No base class, so this is the root of the class hierarchy
-        vtbl.setDim(0);
-        vtbl.push(this);                // leave room for classinfo as first member
-    }
-
-    protection = sc->protection;
-    storage_class |= sc->stc;
-
-    if (sizeok == 0)
-    {
-        interfaceSemantic(sc);
-
-        for (i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = (Dsymbol *)members->data[i];
@@ -546 +546 @@
-                    {   AggregateDeclaration *ad = fd->isMember2();
-                        if (ad)
-                            t = ad->handle;
-                        else
-                        {
-                            t = Type::tvoidptr;
-                        }
-                    }
-                    else
-                        assert(0);
-                    if (t->ty == Tstruct)       // ref to struct
-                        t = Type::tvoidptr;
-                    assert(!vthis);
-                    vthis = new ThisDeclaration(loc, t);
-                    members->push(vthis);
-                }
-            }
-        }
-    }
-
-
-
+
+
+
+
-    if (storage_class & STCabstract)
-        isabstract = 1;
-    if (storage_class & STCimmutable)
-        type = type->invariantOf();
-    else if (storage_class & STCconst)
-        type = type->constOf();
-    else if (storage_class & STCshared)
-        type = type->sharedOf();
-
-    sc = sc->push(this);
-    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-                 STCabstract | STCdeprecated | STC_TYPECTOR | STCtls | STCgshared);
-    sc->stc |= storage_class & STC_TYPECTOR;
-    sc->parent = this;
-    sc->inunion = 0;
-
-    if (isCOMclass())
-    {
-#if _WIN32
-        sc->linkage = LINKwindows;

trunk/src/clone.c

@@ -140 +140 @@
-    fparams->push(param);
-    Type *ftype = new TypeFunction(fparams, handle, FALSE, LINKd);
-#if STRUCTTHISREF
-    ((TypeFunction *)ftype)->isref = 1;
-#endif
-
-    fop = new FuncDeclaration(0, 0, Id::assign, STCundefined, ftype);
-
-    Expression *e = NULL;
-    if (postblit)
-    {   /* Swap:
-         *    tmp = *this; *this = s; tmp.dtor();
-         */
-        //printf("\tswap copy\n");
-        Identifier *idtmp = Lexer::uniqueId("__tmp");
-        VarDeclaration *tmp;
-        AssignExp *ec = NULL;
-        if (dtor)
-        {
-            tmp = new VarDeclaration(0, type, idtmp, new VoidInitializer(0));
-auto
+scope
-            tmp->storage_class |= STCctfe;
-            e = new DeclarationExp(0, tmp);
-            ec = new AssignExp(0,
-                new VarExp(0, tmp),
-#if STRUCTTHISREF
-                new ThisExp(0)
-#else
-                new PtrExp(0, new ThisExp(0))
-#endif
-                );
-            ec->op = TOKblit;
-            e = Expression::combine(e, ec);
-        }
-        ec = new AssignExp(0,
-#if STRUCTTHISREF
-                new ThisExp(0),
-#else
-                new PtrExp(0, new ThisExp(0)),
-#endif
-                new IdentifierExp(0, Id::p));

trunk/src/declaration.c

@@ -635 +635 @@
-
-VarDeclaration::VarDeclaration(Loc loc, Type *type, Identifier *id, Initializer *init)
-    : Declaration(id)
-{
-    //printf("VarDeclaration('%s')\n", id->toChars());
-#ifdef DEBUG
-    if (!type && !init)
-    {   printf("VarDeclaration('%s')\n", id->toChars());
-        //*(char*)0=0;
-    }
-#endif
-    assert(type || init);
-    this->type = type;
-    this->init = init;
-#ifdef _DH
-    this->htype = NULL;
-    this->hinit = NULL;
-#endif
-    this->loc = loc;
-    offset = 0;
-auto
+scope
-#if DMDV2
-    isargptr = FALSE;
-#endif
-#if DMDV1
-    nestedref = 0;
-#endif
-    ctorinit = 0;
-    aliassym = NULL;
-    onstack = 0;
-    canassign = 0;
-    value = NULL;
-    rundtor = NULL;
-}
-
-Dsymbol *VarDeclaration::syntaxCopy(Dsymbol *s)
-{
-    //printf("VarDeclaration::syntaxCopy(%s)\n", toChars());
-
-    VarDeclaration *sv;
-    if (s)
@@ -807 +807 @@
-
-    Type *tb = type->toBasetype();
-    if (tb->ty == Tvoid && !(storage_class & STClazy))
-    {   error("voids have no value");
-        type = Type::terror;
-        tb = type;
-    }
-    if (tb->ty == Tfunction)
-    {   error("cannot be declared to be a function");
-        type = Type::terror;
-        tb = type;
-    }
-    if (tb->ty == Tstruct)
-    {   TypeStruct *ts = (TypeStruct *)tb;
-
-        if (!ts->sym->members)
-        {
-            error("no definition of struct %s", ts->toChars());
-        }
-    }
+    if ((storage_class & STCauto) && !inferred)
+       error("storage class 'auto' has no effect if type is not inferred, did you mean 'scope'?");
-
-    if (tb->ty == Ttuple)
-    {   /* Instead, declare variables for each of the tuple elements
-         * and add those.
-         */
-        TypeTuple *tt = (TypeTuple *)tb;
-        size_t nelems = Parameter::dim(tt->arguments);
-        Objects *exps = new Objects();
-        exps->setDim(nelems);
-        Expression *ie = init ? init->toExpression() : NULL;
-
-        for (size_t i = 0; i < nelems; i++)
-        {   Parameter *arg = Parameter::getNth(tt->arguments, i);
-
-            OutBuffer buf;
-            buf.printf("_%s_field_%zu", ident->toChars(), i);
-            buf.writeByte(0);
-            const char *name = (const char *)buf.extractData();
-            Identifier *id = Lexer::idPool(name);
-
@@ -958 +960 @@
-                error("cannot use template to add field to aggregate '%s'", ad->toChars());
-            }
-        }
-    }
-
-#if DMDV2
-    if ((storage_class & (STCref | STCparameter | STCforeach)) == STCref &&
-        ident != Id::This)
-    {
-        error("only parameters or foreach declarations can be ref");
-    }
-
-    if ((storage_class & (STCstatic | STCextern | STCtls | STCgshared | STCmanifest) ||
-        isDataseg()) &&
-        type->hasWild())
-    {
-        error("only fields, parameters or stack based variables can be inout");
-    }
-#endif
-
-auto() && !noauto
+scope() && !noscope
-    {
-        if (storage_class & (STCfield | STCout | STCref | STCstatic | STCmanifest | STCtls | STCgshared) || !fd)
-        {
-            error("globals, statics, fields, manifest constants, ref and out parameters cannot be scope");
-        }
-
-(STCauto | STCscope)
+STCscope
-        {
-            if (!(storage_class & STCparameter) && ident != Id::withSym)
-                error("reference to scope class must be scope");
-        }
-    }
-
-    if (!init && !fd)
-    {   // If not mutable, initializable by constructor only
-        storage_class |= STCctorinit;
-    }
-
-    if (init)
-        storage_class |= STCinit;     // remember we had an explicit initializer
-    else if (storage_class & STCmanifest)
-        error("manifest constants must have initializers");
-
-    enum TOK op = TOKconstruct;
-    if (!init && !sc->inunion && !isStatic() && fd &&
-        (!(storage_class & (STCfield | STCin | STCforeach | STCparameter | STCresult))
-         || (storage_class & STCout)) &&
@@ -1573 +1575 @@
-
-int VarDeclaration::isCTFE()
-{
-    return (storage_class & STCctfe) != 0; // || !isDataseg();
-}
-
-int VarDeclaration::hasPointers()
-{
-    //printf("VarDeclaration::hasPointers() %s, ty = %d\n", toChars(), type->ty);
-    return (!isDataseg() && type->hasPointers());
-}
-
-/******************************************
- * Return TRUE if variable needs to call the destructor.
- */
-
-int VarDeclaration::needsAutoDtor()
-{
-    //printf("VarDeclaration::needsAutoDtor() %s\n", toChars());
-
-auto
+scope
-        return FALSE;
-
-    // Destructors for structs and arrays of structs
-    Type *tv = type->toBasetype();
-    while (tv->ty == Tsarray)
-    {   TypeSArray *ta = (TypeSArray *)tv;
-        tv = tv->nextOf()->toBasetype();
-    }
-    if (tv->ty == Tstruct)
-    {   TypeStruct *ts = (TypeStruct *)tv;
-        StructDeclaration *sd = ts->sym;
-        if (sd->dtor)
-            return TRUE;
-    }
-
-    // Destructors for classes
-    if (storage_class & (STCauto | STCscope))
-    {
-        if (type->isClassHandle())
-            return TRUE;
-    }
-    return FALSE;
-}
-
-
-/******************************************
-n auto
+ scope
- * Otherwise, return NULL.
- */
-
-Auto
+Scope
-{   Expression *e = NULL;
-
-Auto
-
-auto
+Scope
+
+scope
-        return NULL;
-
-    // Destructors for structs and arrays of structs
-    bool array = false;
-    Type *tv = type->toBasetype();
-    while (tv->ty == Tsarray)
-    {   TypeSArray *ta = (TypeSArray *)tv;
-        array = true;
-        tv = tv->nextOf()->toBasetype();
-    }
-    if (tv->ty == Tstruct)
-    {   TypeStruct *ts = (TypeStruct *)tv;
-        StructDeclaration *sd = ts->sym;
-        if (sd->dtor)
-        {
-            if (array)
-            {
-                // Typeinfo.destroy(cast(void*)&v);
-                Expression *ea = new SymOffExp(loc, this, 0, 0);
-                ea = new CastExp(loc, ea, Type::tvoid->pointerTo());
@@ -1880 +1882 @@
-    : TypeInfoDeclaration(tinfo, 0)
-{
-    type = Type::typeinfodelegate->type;
-}
-
-/***************************** TypeInfoTupleDeclaration **********************/
-
-TypeInfoTupleDeclaration::TypeInfoTupleDeclaration(Type *tinfo)
-    : TypeInfoDeclaration(tinfo, 0)
-{
-    type = Type::typeinfotypelist->type;
-}
-
-/********************************* ThisDeclaration ****************************/
-
-// For the "this" parameter to member functions
-
-ThisDeclaration::ThisDeclaration(Loc loc, Type *t)
-   : VarDeclaration(loc, t, Id::This, NULL)
-{
-auto
+scope
-}
-
-Dsymbol *ThisDeclaration::syntaxCopy(Dsymbol *s)
-{
-    assert(0);          // should never be produced by syntax
-    return NULL;
-}
-

trunk/src/declaration.h

@@ -123 +123 @@
-    const char *kind();
-    unsigned size(Loc loc);
-    void checkModify(Loc loc, Scope *sc, Type *t);
-
-    void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
-    void toDocBuffer(OutBuffer *buf);
-
-    char *mangle();
-    int isStatic() { return storage_class & STCstatic; }
-    virtual int isDelete();
-    virtual int isDataseg();
-    virtual int isThreadlocal();
-    virtual int isCodeseg();
-    int isCtorinit()     { return storage_class & STCctorinit; }
-    int isFinal()        { return storage_class & STCfinal; }
-    int isAbstract()     { return storage_class & STCabstract; }
-    int isConst()        { return storage_class & STCconst; }
-    int isImmutable()    { return storage_class & STCimmutable; }
-    int isAuto()         { return storage_class & STCauto; }
-(STCscope | STCauto)
+STCscope
-    int isSynchronized() { return storage_class & STCsynchronized; }
-    int isParameter()    { return storage_class & STCparameter; }
-    int isDeprecated()   { return storage_class & STCdeprecated; }
-    int isOverride()     { return storage_class & STCoverride; }
-    int isResult()       { return storage_class & STCresult; }
-
-    int isIn()    { return storage_class & STCin; }
-    int isOut()   { return storage_class & STCout; }
-    int isRef()   { return storage_class & STCref; }
-
-    enum PROT prot();
-
-    Declaration *isDeclaration() { return this; }
-};
-
-/**************************************************************/
-
-struct TupleDeclaration : Declaration
-{
-    Objects *objects;
@@ -222 +222 @@
-    const char *kind();
-    Type *getType();
-    Dsymbol *toAlias();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-#ifdef _DH
-    Type *htype;
-    Dsymbol *haliassym;
-#endif
-
-    void toDocBuffer(OutBuffer *buf);
-
-    AliasDeclaration *isAliasDeclaration() { return this; }
-};
-
-/**************************************************************/
-
-struct VarDeclaration : Declaration
-{
-    Initializer *init;
-    unsigned offset;
-auto
+scope
-#if DMDV2
-    FuncDeclarations nestedrefs; // referenced by these lexically nested functions
-    bool isargptr;              // if parameter that _argptr points to
-#else
-    int nestedref;              // referenced by a lexically nested function
-#endif
-    int ctorinit;               // it has been initialized in a ctor
-    int onstack;                // 1: it has been allocated on the stack
-                                // 2: on stack, run destructor anyway
-    int canassign;              // it can be assigned to
-    Dsymbol *aliassym;          // if redone as alias to another symbol
-    Expression *value;          // when interpreting, this is the value
-                                // (NULL if value not determinable)
-#if DMDV2
-    VarDeclaration *rundtor;    // if !NULL, rundtor is tested at runtime to see
-                                // if the destructor should be run. Used to prevent
-                                // dtor calls on postblitted vars
-#endif
-
-    VarDeclaration(Loc loc, Type *t, Identifier *id, Initializer *init);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    const char *kind();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-#ifdef _DH
-    Type *htype;
-    Initializer *hinit;
-#endif
-    int needThis();
-    int isImportedSymbol();
-    int isDataseg();
-    int isThreadlocal();
-    int isCTFE();
-    int hasPointers();
-#if DMDV2
-    int canTakeAddressOf();
-    int needsAutoDtor();
-#endif
-Auto
+Scope
-    ExpInitializer *getExpInitializer();
-    Expression *getConstInitializer();
-    void checkCtorConstInit();
-    void checkNestedReference(Scope *sc, Loc loc);
-    Dsymbol *toAlias();
-
-    Symbol *toSymbol();
-    void toObjFile(int multiobj);                       // compile to .obj file
-    int cvMember(unsigned char *p);
-
-    // Eliminate need for dynamic_cast
-    VarDeclaration *isVarDeclaration() { return (VarDeclaration *)this; }
-};
-
-/**************************************************************/
-
-// This is a shell around a back end symbol
-
-struct SymbolDeclaration : Declaration
-{

trunk/src/expression.c

@@ -4324 +4324 @@
-}
-
-char *VarExp::toChars()
-{
-    return var->toChars();
-}
-
-void VarExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring(var->toChars());
-}
-
-void VarExp::checkEscape()
-{
-    VarDeclaration *v = var->isVarDeclaration();
-    if (v)
-    {   Type *tb = v->type->toBasetype();
-        // if reference type
-        if (tb->ty == Tarray || tb->ty == Tsarray || tb->ty == Tclass)
-        {
-(v->isAuto() || v->isScope()) && !v->noauto
+v->isScope() && !v->noscope
-                error("escaping reference to scope local %s", v->toChars());
-            else if (v->storage_class & STCvariadic)
-                error("escaping reference to variadic parameter %s", v->toChars());
-        }
-    }
-}
-
-void VarExp::checkEscapeRef()
-{
-    VarDeclaration *v = var->isVarDeclaration();
-    if (v)
-    {
-        if (!v->isDataseg() && !(v->storage_class & (STCref | STCout)))
-            error("escaping reference to local variable %s", v->toChars());
-    }
-}
-
-#if DMDV2
-int VarExp::isLvalue()
-{

trunk/src/func.c

@@ -1090 +1090 @@
-            assert(type->nextOf());
-            if (type->nextOf()->ty == Tvoid)
-            {
-                if (outId)
-                    error("void functions have no result");
-            }
-            else
-            {
-                if (!outId)
-                    outId = Id::result;         // provide a default
-            }
-
-            if (outId)
-            {   // Declare result variable
-                Loc loc = this->loc;
-
-                if (fensure)
-                    loc = fensure->loc;
-
-                VarDeclaration *v = new VarDeclaration(loc, type->nextOf(), outId, NULL);
-auto
+scope
-                v->storage_class |= STCresult;
-#if DMDV2
-                if (!isVirtual())
-                    v->storage_class |= STCconst;
-                if (f->isref)
-                {
-                    v->storage_class |= STCref | STCforeach;
-                }
-#endif
-                sc2->incontract--;
-                v->semantic(sc2);
-                sc2->incontract++;
-                if (!sc2->insert(v))
-                    error("out result %s is already defined", v->toChars());
-                v->parent = this;
-                vresult = v;
-
-                // vresult gets initialized with the function return value
-                // in ReturnStatement::semantic()
-            }
@@ -1501 +1501 @@
-
-            fbody = new CompoundStatement(0, a);
-#if DMDV2
-            /* Append destructor calls for parameters as finally blocks.
-             */
-            if (parameters)
-            {   for (size_t i = 0; i < parameters->dim; i++)
-                {
-                    VarDeclaration *v = (VarDeclaration *)parameters->data[i];
-
-                    if (v->storage_class & (STCref | STCout))
-                        continue;
-
-                    /* Don't do this for static arrays, since static
-                     * arrays are called by reference. Remove this
-                     * when we change them to call by value.
-                     */
-                    if (v->type->toBasetype()->ty == Tsarray)
-                        continue;
-
-Auto
+Scope
-                    if (e)
-                    {   Statement *s = new ExpStatement(0, e);
-                        s = s->semantic(sc2);
-                        if (fbody->blockExit() == BEfallthru)
-                            fbody = new CompoundStatement(0, fbody, s);
-                        else
-                            fbody = new TryFinallyStatement(0, fbody, s);
-                    }
-                }
-            }
-#endif
-
-#if 1
-            if (isSynchronized())
-            {   /* Wrap the entire function body in a synchronized statement
-                 */
-                ClassDeclaration *cd = parent->isClassDeclaration();
-                if (cd)
-                {
-#if TARGET_WINDOS

trunk/src/mtype.c

@@ -1559 +1559 @@
-int Type::iscomplex()
-{
-    return FALSE;
-}
-
-int Type::isscalar()
-{
-    return FALSE;
-}
-
-int Type::isunsigned()
-{
-    return FALSE;
-}
-
-ClassDeclaration *Type::isClassHandle()
-{
-    return NULL;
-}
-
-auto
+scope
-{
-    return FALSE;
-}
-
-int Type::isString()
-{
-    return FALSE;
-}
-
-/**************************
- * Given:
- *      T a, b;
- * Can we assign:
- *      a = b;
- * ?
- */
-int Type::isAssignable()
-{
-    return TRUE;
-}
@@ -3380 +3380 @@
-
-            if (d >= tt->arguments->dim)
-            {   error(loc, "tuple index %ju exceeds %u", d, tt->arguments->dim);
-                return Type::terror;
-            }
-            Parameter *arg = (Parameter *)tt->arguments->data[(size_t)d];
-            return arg->type;
-        }
-        case Tstruct:
-        {   TypeStruct *ts = (TypeStruct *)tbn;
-            if (ts->sym->isnested)
-                error(loc, "cannot have array of inner structs %s", ts->toChars());
-            break;
-        }
-        case Tfunction:
-        case Tnone:
-            error(loc, "can't have array of %s", tbn->toChars());
-            tbn = next = tint32;
-            break;
-    }
-auto
-auto
+scope
+scope
-    return merge();
-}
-
-void TypeSArray::toDecoBuffer(OutBuffer *buf, int flag)
-{
-    Type::toDecoBuffer(buf, flag);
-    if (dim)
-        buf->printf("%ju", dim->toInteger());
-    if (next)
-        /* Note that static arrays are value types, so
-         * for a parameter, propagate the 0x100 to the next
-         * level, since for T[4][3], any const should apply to the T,
-         * not the [4].
-         */
-        next->toDecoBuffer(buf,  (flag & 0x100) ? flag : mod);
-}
-
-void TypeSArray::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
@@ -3609 +3609 @@
-Type *TypeDArray::semantic(Loc loc, Scope *sc)
-{   Type *tn = next;
-
-    tn = next->semantic(loc,sc);
-    Type *tbn = tn->toBasetype();
-    switch (tbn->ty)
-    {
-        case Tfunction:
-        case Tnone:
-        case Ttuple:
-            error(loc, "can't have array of %s", tbn->toChars());
-            tn = next = tint32;
-            break;
-        case Tstruct:
-        {   TypeStruct *ts = (TypeStruct *)tbn;
-            if (ts->sym->isnested)
-                error(loc, "cannot have array of inner structs %s", ts->toChars());
-            break;
-        }
-    }
-auto
-auto
+scope
+scope
-
-    next = tn;
-    transitive();
-    return merge();
-}
-
-void TypeDArray::toDecoBuffer(OutBuffer *buf, int flag)
-{
-    Type::toDecoBuffer(buf, flag);
-    if (next)
-        next->toDecoBuffer(buf, (flag & 0x100) ? 0 : mod);
-}
-
-void TypeDArray::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }
-    if (equals(tstring))
@@ -3812 +3812 @@
-Type *TypeNewArray::semantic(Loc loc, Scope *sc)
-{   Type *tn = next;
-
-    tn = next->semantic(loc,sc);
-    Type *tbn = tn->toBasetype();
-    switch (tbn->ty)
-    {
-        case Tfunction:
-        case Tnone:
-        case Ttuple:
-            error(loc, "can't have array of %s", tbn->toChars());
-            tn = next = tint32;
-            break;
-        case Tstruct:
-        {   TypeStruct *ts = (TypeStruct *)tbn;
-            if (ts->sym->isnested)
-                error(loc, "cannot have array of inner structs %s", ts->toChars());
-            break;
-        }
-    }
-auto
-auto
+scope
+scope
-
-    next = tn;
-    transitive();
-    return merge();
-}
-
-void TypeNewArray::toDecoBuffer(OutBuffer *buf, int flag)
-{
-    Type::toDecoBuffer(buf, flag);
-    buf->writeByte('e');
-    if (next)
-        next->toDecoBuffer(buf, (flag & 0x100) ? 0 : mod);
-}
-
-void TypeNewArray::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }
@@ -3940 +3940 @@
-    switch (index->toBasetype()->ty)
-    {
-        case Tbool:
-        case Tfunction:
-        case Tvoid:
-        case Tnone:
-        case Ttuple:
-            error(loc, "can't have associative array key of %s", index->toBasetype()->toChars());
-            return Type::terror;
-    }
-    next = next->semantic(loc,sc);
-    transitive();
-
-    switch (next->toBasetype()->ty)
-    {
-        case Tfunction:
-        case Tnone:
-            error(loc, "can't have associative array of %s", next->toChars());
-            return Type::terror;
-    }
-auto
-auto
+scope
+scope
-        return Type::terror;
-    }
-    return merge();
-}
-
-StructDeclaration *TypeAArray::getImpl()
-{
-    // Do it lazily
-    if (!impl)
-    {
-        Type *index = this->index;
-        Type *next = this->next;
-        if (index->reliesOnTident() || next->reliesOnTident())
-        {
-            error(loc, "cannot create associative array %s", toChars());
-            index = terror;
-            next = terror;
-        }
-        /* This is really a proxy for the template instance AssocArray!(index, next)
-         * But the instantiation can fail if it is a template specialization field
@@ -4840 +4840 @@
-        }
-
-    bool wildreturn = FALSE;
-    if (tf->next)
-    {
-        tf->next = tf->next->semantic(loc,sc);
-#if !SARRAYVALUE
-        if (tf->next->toBasetype()->ty == Tsarray)
-        {   error(loc, "functions cannot return static array %s", tf->next->toChars());
-            tf->next = Type::terror;
-        }
-#endif
-        if (tf->next->toBasetype()->ty == Tfunction)
-        {   error(loc, "functions cannot return a function");
-            tf->next = Type::terror;
-        }
-        if (tf->next->toBasetype()->ty == Ttuple)
-        {   error(loc, "functions cannot return a tuple");
-            tf->next = Type::terror;
-        }
-auto
+scope
-            error(loc, "functions cannot return scope %s", tf->next->toChars());
-        if (tf->next->toBasetype()->ty == Tvoid)
-            tf->isref = FALSE;                  // rewrite "ref void" as just "void"
-        if (tf->next->isWild())
-            wildreturn = TRUE;
-    }
-
-    bool wildparams = FALSE;
-    bool wildsubparams = FALSE;
-    if (tf->parameters)
-    {
-        /* Create a scope for evaluating the default arguments for the parameters
-         */
-        Scope *argsc = sc->push();
-        argsc->stc = 0;                 // don't inherit storage class
-        argsc->protection = PROTpublic;
-
-        size_t dim = Parameter::dim(tf->parameters);
-        for (size_t i = 0; i < dim; i++)
-        {   Parameter *fparam = Parameter::getNth(tf->parameters, i);
@@ -7402 +7402 @@
-
-    if (d->parent && d->toParent()->isModule())
-    {
-        // (e, d)
-
-        VarExp *ve = new VarExp(e->loc, d, 1);
-        e = new CommaExp(e->loc, e, ve);
-        e->type = d->type;
-        return e;
-    }
-
-    DotVarExp *de = new DotVarExp(e->loc, e, d);
-    return de->semantic(sc);
-}
-
-ClassDeclaration *TypeClass::isClassHandle()
-{
-    return sym;
-}
-
-auto
-
-auto
+scope
+
+scope
-}
-
-int TypeClass::isBaseOf(Type *t, int *poffset)
-{
-    if (t->ty == Tclass)
-    {   ClassDeclaration *cd;
-
-        cd   = ((TypeClass *)t)->sym;
-        if (sym->isBaseOf(cd, poffset))
-            return 1;
-    }
-    return 0;
-}
-
-MATCH TypeClass::implicitConvTo(Type *to)
-{
-    //printf("TypeClass::implicitConvTo(to = '%s') %s\n", to->toChars(), toChars());
-    MATCH m = constConv(to);
-    if (m != MATCHnomatch)
-        return m;

trunk/src/mtype.h

@@ -229 +229 @@
-    virtual unsigned alignsize();
-    virtual Type *semantic(Loc loc, Scope *sc);
-    Type *trySemantic(Loc loc, Scope *sc);
-    virtual void toDecoBuffer(OutBuffer *buf, int flag = 0);
-    Type *merge();
-    Type *merge2();
-    virtual void toCBuffer(OutBuffer *buf, Identifier *ident, HdrGenState *hgs);
-    virtual void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    void toCBuffer3(OutBuffer *buf, HdrGenState *hgs, int mod);
-    void modToBuffer(OutBuffer *buf);
-#if CPP_MANGLE
-    virtual void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-    virtual int isintegral();
-    virtual int isfloating();   // real, imaginary, or complex
-    virtual int isreal();
-    virtual int isimaginary();
-    virtual int iscomplex();
-    virtual int isscalar();
-    virtual int isunsigned();
-auto
+scope
-    virtual int isString();
-    virtual int isAssignable();
-    virtual int checkBoolean(); // if can be converted to boolean value
-    virtual void checkDeprecated(Loc loc, Scope *sc);
-    int isConst()       { return mod & MODconst; }
-    int isImmutable()   { return mod & MODimmutable; }
-    int isMutable()     { return !(mod & (MODconst | MODimmutable | MODwild)); }
-    int isShared()      { return mod & MODshared; }
-    int isSharedConst() { return mod == (MODshared | MODconst); }
-    int isWild()        { return mod & MODwild; }
-    int isSharedWild()  { return mod == (MODshared | MODwild); }
-    int isNaked()       { return mod == 0; }
-    Type *constOf();
-    Type *invariantOf();
-    Type *mutableOf();
-    Type *sharedOf();
-    Type *sharedConstOf();
-    Type *unSharedOf();
-    Type *wildOf();
-    Type *sharedWildOf();
@@ -797 +797 @@
-
-struct TypeClass : Type
-{
-    ClassDeclaration *sym;
-
-    TypeClass(ClassDeclaration *sym);
-    d_uns64 size(Loc loc);
-    char *toChars();
-    Type *syntaxCopy();
-    Type *semantic(Loc loc, Scope *sc);
-    Dsymbol *toDsymbol(Scope *sc);
-    void toDecoBuffer(OutBuffer *buf, int flag);
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    ClassDeclaration *isClassHandle();
-    int isBaseOf(Type *t, int *poffset);
-    MATCH implicitConvTo(Type *to);
-    Expression *defaultInit(Loc loc);
-    int isZeroInit(Loc loc);
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-auto
+scope
-    int checkBoolean();
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    int hasPointers();
-    int builtinTypeInfo();
-#if DMDV2
-    Type *toHeadMutable();
-    MATCH constConv(Type *to);
-#if CPP_MANGLE
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-#endif
-
-    type *toCtype();
-
-    Symbol *toSymbol();
-};
-
-struct TypeTuple : Type
-{
-    Parameters *arguments;      // types making up the tuple

trunk/src/statement.c

@@ -369 +369 @@
-}
-
-void DeclarationStatement::scopeCode(Scope *sc, Statement **sentry, Statement **sexception, Statement **sfinally)
-{
-    //printf("DeclarationStatement::scopeCode()\n");
-    //print();
-
-    *sentry = NULL;
-    *sexception = NULL;
-    *sfinally = NULL;
-
-    if (exp)
-    {
-        if (exp->op == TOKdeclaration)
-        {
-            DeclarationExp *de = (DeclarationExp *)(exp);
-            VarDeclaration *v = de->declaration->isVarDeclaration();
-            if (v)
-            {   Expression *e;
-
-Auto
+Scope
-                if (e)
-                {
-                    //printf("dtor is: "); e->print();
-#if 0
-                    if (v->type->toBasetype()->ty == Tstruct)
-                    {   /* Need a 'gate' to turn on/off destruction,
-                         * in case v gets moved elsewhere.
-                         */
-                        Identifier *id = Lexer::uniqueId("__runDtor");
-                        ExpInitializer *ie = new ExpInitializer(loc, new IntegerExp(1));
-                        VarDeclaration *rd = new VarDeclaration(loc, Type::tint32, id, ie);
-                        *sentry = new DeclarationStatement(loc, rd);
-                        v->rundtor = rd;
-
-                        /* Rewrite e as:
-                         *  rundtor && e
-                         */
-                        Expression *ve = new VarExp(loc, v->rundtor);
-                        e = new AndAndExp(loc, ve, e);
-                        e->type = Type::tbool;
@@ -1743 +1743 @@
-        }
-#endif
-        case Tdelegate:
-        Lapply:
-        {
-            Expression *ec;
-            Expression *e;
-            Parameter *a;
-
-            if (!checkForArgTypes())
-            {   body = body->semanticNoScope(sc);
-                return this;
-            }
-
-            Type *tret = func->type->nextOf();
-
-            // Need a variable to hold value from any return statements in body.
-            if (!sc->func->vresult && tret && tret != Type::tvoid)
-            {
-                VarDeclaration *v = new VarDeclaration(loc, tret, Id::result, NULL);
-auto
+scope
-                v->semantic(sc);
-                if (!sc->insert(v))
-                    assert(0);
-                v->parent = sc->func;
-                sc->func->vresult = v;
-            }
-
-            /* Turn body into the function literal:
-             *  int delegate(ref T arg) { body }
-             */
-            Parameters *args = new Parameters();
-            for (size_t i = 0; i < dim; i++)
-            {   Parameter *arg = (Parameter *)arguments->data[i];
-                Identifier *id;
-
-                arg->type = arg->type->semantic(loc, sc);
-                if (arg->storageClass & STCref)
-                    id = arg->ident;
-                else
-                {   // Make a copy of the ref argument so it isn't
@@ -2323 +2323 @@
-    // If we can short-circuit evaluate the if statement, don't do the
-    // semantic analysis of the skipped code.
-    // This feature allows a limited form of conditional compilation.
-    condition = condition->optimize(WANTflags);
-
-    // Evaluate at runtime
-    unsigned cs0 = sc->callSuper;
-    unsigned cs1;
-
-    Scope *scd;
-    if (arg)
-    {   /* Declare arg, which we will set to be the
-         * result of condition.
-         */
-        ScopeDsymbol *sym = new ScopeDsymbol();
-        sym->parent = sc->scopesym;
-        scd = sc->push(sym);
-
-        Type *t = arg->type ? arg->type : condition->type;
-        match = new VarDeclaration(loc, t, arg->ident, NULL);
-auto
+scope
-        match->semantic(scd);
-        if (!scd->insert(match))
-            assert(0);
-        match->parent = sc->func;
-
-        /* Generate:
-         *  (arg = condition)
-         */
-        VarExp *v = new VarExp(0, match);
-        condition = new AssignExp(loc, v, condition);
-        condition = condition->semantic(scd);
-    }
-    else
-        scd = sc->push();
-
-    ifbody = ifbody->semanticNoScope(scd);
-    scd->pop();
-
-    cs1 = sc->callSuper;
-    sc->callSuper = cs0;
@@ -3479 +3479 @@
-            sc->fes->cases->push(this);
-            // Construct: return cases->dim+1;
-            s = new ReturnStatement(0, new IntegerExp(sc->fes->cases->dim + 1));
-        }
-        else if (fd->type->nextOf()->toBasetype() == Type::tvoid)
-        {
-            s = new ReturnStatement(0, NULL);
-            sc->fes->cases->push(s);
-
-            // Construct: { exp; return cases->dim + 1; }
-            Statement *s1 = new ExpStatement(loc, exp);
-            Statement *s2 = new ReturnStatement(0, new IntegerExp(sc->fes->cases->dim + 1));
-            s = new CompoundStatement(loc, s1, s2);
-        }
-        else
-        {
-            // Construct: return vresult;
-            if (!fd->vresult)
-            {   // Declare vresult
-                VarDeclaration *v = new VarDeclaration(loc, tret, Id::result, NULL);
-auto
+scope
-                v->storage_class |= STCresult;
-                v->semantic(scx);
-                if (!scx->insert(v))
-                    assert(0);
-                v->parent = fd;
-                fd->vresult = v;
-            }
-
-            s = new ReturnStatement(0, new VarExp(0, fd->vresult));
-            sc->fes->cases->push(s);
-
-            // Construct: { vresult = exp; return cases->dim + 1; }
-            exp = new ConstructExp(loc, new VarExp(0, fd->vresult), exp);
-            exp = exp->semantic(sc);
-            Statement *s1 = new ExpStatement(loc, exp);
-            Statement *s2 = new ReturnStatement(0, new IntegerExp(sc->fes->cases->dim + 1));
-            s = new CompoundStatement(loc, s1, s2);
-        }
-        return s;
-    }