Changeset 1526:54b3c1394d62

Timestamp:

07/06/09 21:26:11 (3 years ago)

Author:

Robert Clipsham <robert@octarineparrot.com>

branch:

default

Message:

Merged dmdfe 2.031.

Files:

• dmd2/arrayop.c (modified) (2 diffs)
• dmd2/attrib.c (modified) (14 diffs)
• dmd2/attrib.h (modified) (4 diffs)
• dmd2/cast.c (modified) (10 diffs)
• dmd2/class.c (modified) (6 diffs)
• dmd2/cond.c (modified) (1 diff)
• dmd2/constfold.c (modified) (1 diff)
• dmd2/declaration.c (modified) (21 diffs)
• dmd2/declaration.h (modified) (3 diffs)
• dmd2/dsymbol.c (modified) (9 diffs)
• dmd2/dsymbol.h (modified) (5 diffs)
• dmd2/enum.c (modified) (1 diff)
• dmd2/enum.h (modified) (1 diff)
• dmd2/expression.c (modified) (28 diffs)
• dmd2/expression.h (modified) (14 diffs)
• dmd2/func.c (modified) (15 diffs)
• dmd2/import.c (modified) (7 diffs)
• dmd2/import.h (modified) (2 diffs)
• dmd2/inifile.c (modified) (2 diffs)
• dmd2/init.c (modified) (4 diffs)
• dmd2/interpret.c (modified) (2 diffs)
• dmd2/lexer.c (modified) (1 diff)
• dmd2/mangle.c (modified) (1 diff)
• dmd2/mars.c (modified) (1 diff)
• dmd2/mars.h (modified) (2 diffs)
• dmd2/module.c (modified) (8 diffs)
• dmd2/module.h (modified) (1 diff)
• dmd2/mtype.c (modified) (23 diffs)
• dmd2/mtype.h (modified) (2 diffs)
• dmd2/opover.c (modified) (4 diffs)
• dmd2/optimize.c (modified) (2 diffs)
• dmd2/parse.c (modified) (14 diffs)
• dmd2/root/async.c (modified) (2 diffs)
• dmd2/scope.c (modified) (2 diffs)
• dmd2/scope.h (modified) (1 diff)
• dmd2/statement.c (modified) (18 diffs)
• dmd2/statement.h (modified) (17 diffs)
• dmd2/struct.c (modified) (4 diffs)
• dmd2/template.c (modified) (30 diffs)
• dmd2/template.h (modified) (3 diffs)

dmd2/arrayop.c

@@ -1 +1 @@
-
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -436 +436 @@
-     */
-    Expression *ex2 = e2->buildArrayLoop(fparams);
+    /* Need the cast because:
+     *   b = c + p[i];
+     * where b is a byte fails because (c + p[i]) is an int
+     * which cannot be implicitly cast to byte.
+     */
+    ex2 = new CastExp(0, ex2, e1->type->nextOf());
-    Expression *ex1 = e1->buildArrayLoop(fparams);
-    Argument *param = (Argument *)fparams->data[0];

dmd2/attrib.c

@@ -27 +27 @@
-#include "parse.h"
-#include "template.h"
+#if TARGET_NET
+ #include "frontend.net/pragma.h"
+#endif
-
-#if IN_LLVM
@@ -73 +76 @@
-    }
-    return m;
+}
+
+void AttribDeclaration::semanticNewSc(Scope *sc,
+    unsigned stc, enum LINK linkage, enum PROT protection, int explicitProtection,
+    unsigned structalign)
+{
+    if (decl)
+    {
+    Scope *newsc = sc;
+    if (stc != sc->stc ||
+        linkage != sc->linkage ||
+        protection != sc->protection ||
+        explicitProtection != sc->explicitProtection ||
+        structalign != sc->structalign)
+    {
+        // create new one for changes
+        newsc = new Scope(*sc);
+        newsc->flags &= ~SCOPEfree;
+        newsc->stc = stc;
+        newsc->linkage = linkage;
+        newsc->protection = protection;
+        newsc->explicitProtection = explicitProtection;
+        newsc->structalign = structalign;
+    }
+    for (unsigned i = 0; i < decl->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)decl->data[i];
+
+        s->semantic(newsc);
+    }
+    if (newsc != sc)
+    {
+        sc->offset = newsc->offset;
+        newsc->pop();
+    }
+    }
-}
-
@@ -306 +344 @@
-{
-    if (decl)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    sc->stc |= stc;
-    for (unsigned i = 0; i < decl->dim; i++)
@@ -318 +384 @@
-    }
-    sc->stc = stc_save;
-
-
-
+
+
-}
-
@@ -394 +459 @@
-    //printf("LinkDeclaration::semantic(linkage = %d, decl = %p)\n", linkage, decl);
-    if (decl)
-
+
+
+
+
+
-
-    sc->linkage = linkage;
@@ -404 +473 @@
-    }
-    sc->linkage = linkage_save;
-
-
-
-
+
-    }
-}
@@ -482 +548 @@
-{
-    if (decl)
-
+
+
+
+
+
-    int explicitProtection_save = sc->explicitProtection;
-
@@ -495 +565 @@
-    sc->protection = protection_save;
-    sc->explicitProtection = explicitProtection_save;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    switch (protection)
@@ -517 +585 @@
-    }
-    buf->writestring(p);
+    buf->writeByte(' ');
+}
+
+void ProtDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    protectionToCBuffer(buf, protection);
-    AttribDeclaration::toCBuffer(buf, hgs);
-}
@@ -546 +620 @@
-    //printf("\tAlignDeclaration::semantic '%s'\n",toChars());
-    if (decl)
-
+
+
+
+
+
+
-#if IN_DMD
-    sc->structalign = salign;
@@ -554 +633 @@
-        Dsymbol *s = (Dsymbol *)decl->data[i];
-
+#if IN_LLVM
-        if (s->isStructDeclaration() && salign == 1)
-        {
@@ -562 +642 @@
-        else
-        {
+#endif
-            s->semantic(sc);
-
+
+
+
-    }
-    sc->structalign = salign_save;
+#endif
-    }
-    else
@@ -585 +669 @@
-    this->loc = loc;
-    this->isunion = isunion;
-    this->scope = NULL;
-    this->sem = 0;
-}
@@ -896 +979 @@
-    goto Lnodecl;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-// LDC
-#if IN_LLVM

dmd2/attrib.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -37 +37 @@
-    virtual Array *include(Scope *sc, ScopeDsymbol *s);
-    int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
+    void semanticNewSc(Scope *sc,
+    unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection,
+    unsigned structalign);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
@@ -93 +96 @@
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+
+    static void protectionToCBuffer(OutBuffer *buf, enum PROT protection);
-};
-
@@ -108 +113 @@
-{
-    int isunion;
-    Scope *scope;       // !=NULL means context to use
-    int sem;            // 1 if successful semantic()
-

dmd2/cast.c

@@ -34 +34 @@
-    {   TY tyfrom = type->toBasetype()->ty;
-    TY tyto = t->toBasetype()->ty;
+#if DMDV1
-    if (global.params.warnings &&
-        Type::impcnvWarn[tyfrom][tyto] &&
@@ -42 +43 @@
-        if (e->op == TOKint64)
-        return e->implicitCastTo(sc, t);
-
-        if (tyfrom == Tint32 &&
-        (op == TOKadd || op == TOKmin ||
@@ -62 +62 @@
-        }
-    }
+#endif
-#if DMDV2
-    if (match == MATCHconst && t == type->constOf())
@@ -145 +146 @@
-    if (match != MATCHnomatch)
-    return match;
+
+    /* See if we can do integral narrowing conversions
+     */
+    if (type->isintegral() && t->isintegral() &&
+    type->isTypeBasic() && t->isTypeBasic())
+    {   IntRange ir = getIntRange();
+    if (ir.imax <= t->sizemask())
+        return MATCHconvert;
+    }
+
-#if 0
-    Type *tb = t->toBasetype();
@@ -677 +688 @@
-}
-
+MATCH OrExp::implicitConvTo(Type *t)
+{
+    MATCH result = Expression::implicitConvTo(t);
+
+    if (result == MATCHnomatch)
+    {
+    MATCH m1 = e1->implicitConvTo(t);
+    MATCH m2 = e2->implicitConvTo(t);
+
+    // Pick the worst match
+    result = (m1 < m2) ? m1 : m2;
+    }
+    return result;
+}
+
+MATCH XorExp::implicitConvTo(Type *t)
+{
+    MATCH result = Expression::implicitConvTo(t);
+
+    if (result == MATCHnomatch)
+    {
+    MATCH m1 = e1->implicitConvTo(t);
+    MATCH m2 = e2->implicitConvTo(t);
+
+    // Pick the worst match
+    result = (m1 < m2) ? m1 : m2;
+    }
+    return result;
+}
+
-MATCH CondExp::implicitConvTo(Type *t)
-{
-
-
-
-
-
+
+
+
-
-    // Pick the worst match
@@ -689 +728 @@
-}
-
+MATCH CommaExp::implicitConvTo(Type *t)
+{
+    return e2->implicitConvTo(t);
+}
+
+MATCH CastExp::implicitConvTo(Type *t)
+{
+#if 0
+    printf("CastExp::implicitConvTo(this=%s, type=%s, t=%s)\n",
+    toChars(), type->toChars(), t->toChars());
+#endif
+    MATCH result;
+
+    result = type->implicitConvTo(t);
+
+    if (result == MATCHnomatch)
+    {
+    if (t->isintegral() &&
+        e1->type->isintegral() &&
+        e1->implicitConvTo(t) != MATCHnomatch)
+        result = MATCHconvert;
+    else
+        result = Expression::implicitConvTo(t);
+    }
+    return result;
+}
-
-/* ==================== castTo ====================== */
@@ -1259 +1324 @@
-        if (f)
-        {
- && f->needThis() && hasThis(sc)
+
-            {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            else
@@ -1274 +1350 @@
-            e->type = t;
-            }
+#if DMDV2
-            f->tookAddressOf++;
+#endif
-            return e;
-        }
@@ -1354 +1432 @@
-}
-
+Expression *CommaExp::castTo(Scope *sc, Type *t)
+{
+    Expression *e2c = e2->castTo(sc, t);
+    Expression *e;
+
+    if (e2c != e2)
+    {
+    e = new CommaExp(loc, e1, e2c);
+    e->type = e2c->type;
+    }
+    else
+    {   e = this;
+    e->type = e2->type;
+    }
+    return e;
+}
+
-/* ==================== ====================== */
-
@@ -1778 +1873 @@
-    return 0;
-}
+
+/******************************************************************/
+
+/* Determine the integral ranges of an expression.
+ * This is used to determine if implicit narrowing conversions will
+ * be allowed.
+ */
+
+uinteger_t getMask(uinteger_t v)
+{
+    uinteger_t u = 0;
+    if (v >= 0x80)
+    u = 0xFF;
+    while (u < v)
+    u = (u << 1) | 1;
+    return u;
+}
+
+IntRange Expression::getIntRange()
+{
+    IntRange ir;
+    ir.imin = 0;
+    ir.imax = type->sizemask();
+    return ir;
+}
+
+IntRange IntegerExp::getIntRange()
+{
+    IntRange ir;
+    ir.imin = value & type->sizemask();
+    ir.imax = ir.imin;
+    return ir;
+}
+
+IntRange CastExp::getIntRange()
+{
+    IntRange ir;
+    ir = e1->getIntRange();
+    // Do sign extension
+    switch (e1->type->toBasetype()->ty)
+    {
+    case Tint8:
+        if (ir.imax & 0x80)
+        ir.imax |= 0xFFFFFFFFFFFFFF00ULL;
+        break;
+    case Tint16:
+        if (ir.imax & 0x8000)
+        ir.imax |= 0xFFFFFFFFFFFF0000ULL;
+        break;
+    case Tint32:
+        if (ir.imax & 0x80000000)
+        ir.imax |= 0xFFFFFFFF00000000ULL;
+        break;
+    }
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+//printf("CastExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+    return ir;
+}
+
+IntRange DivExp::getIntRange()
+{
+    if (!e1->type->isunsigned() && !e2->type->isunsigned())
+    return Expression::getIntRange();
+
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = ir1.imin / ir2.imax;
+    ir.imax = ir1.imax / ir2.imin;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("DivExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange AndExp::getIntRange()
+{
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = ir1.imin;
+    if (ir2.imin < ir.imin)
+    ir.imin = ir2.imin;
+
+    ir.imax = ir1.imax;
+    if (ir2.imax > ir.imax)
+    ir.imax = ir2.imax;
+
+    uinteger_t u;
+
+    u = getMask(ir1.imax);
+    ir.imin &= u;
+    ir.imax &= u;
+
+    u = getMask(ir2.imax);
+    ir.imin &= u;
+    ir.imax &= u;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("AndExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange OrExp::getIntRange()
+{
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = ir1.imin;
+    if (ir2.imin < ir.imin)
+    ir.imin = ir2.imin;
+
+    ir.imax = ir1.imax;
+    if (ir2.imax > ir.imax)
+    ir.imax = ir2.imax;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("OrExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange XorExp::getIntRange()
+{
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = ir1.imin;
+    if (ir2.imin < ir.imin)
+    ir.imin = ir2.imin;
+
+    ir.imax = ir1.imax;
+    if (ir2.imax > ir.imax)
+    ir.imax = ir2.imax;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("XorExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange ShlExp::getIntRange()
+{
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = getMask(ir1.imin) << ir2.imin;
+    ir.imax = getMask(ir1.imax) << ir2.imax;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("ShlExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange ShrExp::getIntRange()
+{
+    if (!e1->type->isunsigned())
+    return Expression::getIntRange();
+
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = ir1.imin >> ir2.imax;
+    ir.imax = ir1.imax >> ir2.imin;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("ShrExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange UshrExp::getIntRange()
+{
+    IntRange ir;
+    IntRange ir1 = e1->getIntRange();
+    IntRange ir2 = e2->getIntRange();
+
+    ir.imin = ir1.imin >> ir2.imax;
+    ir.imax = ir1.imax >> ir2.imin;
+
+    ir.imin &= type->sizemask();
+    ir.imax &= type->sizemask();
+
+//printf("UshrExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+//e1->dump(0);
+
+    return ir;
+}
+
+IntRange CommaExp::getIntRange()
+{
+    return e2->getIntRange();
+}
+
+

dmd2/class.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -234 +234 @@
-    }
-
-ope
-
-   
-    
-
-   
-   handle = handle->semantic(loc, sc)
-
+
+
+    
+
+
+    
+    handle = type
+
-    if (!members)           // if forward reference
-    {   //printf("\tclass '%s' is forward referenced\n", toChars());
@@ -276 +276 @@
-    for (i = 0; i < baseclasses.dim; )
-    {   BaseClass *b = (BaseClass *)baseclasses.data[i];
+//printf("test1 %s %s\n", toChars(), b->type->toChars());
-    b->type = b->type->semantic(loc, sc);
+//printf("test2\n");
-    Type *tb = b->type->toBasetype();
-
@@ -335 +337 @@
-            }
-        }
+        if (!tc->sym->symtab || tc->sym->sizeok == 0)
+        {   // Try to resolve forward reference
+            if (sc->mustsemantic && tc->sym->scope)
+            tc->sym->semantic(NULL);
+        }
-        if (!tc->sym->symtab || tc->sym->scope || tc->sym->sizeok == 0)
-        {
+            //printf("%s: forward reference of base class %s\n", toChars(), tc->sym->toChars());
-            //error("forward reference of base class %s", baseClass->toChars());
-            // Forward reference of base class, try again later
@@ -794 +802 @@
-    //printf("%s.ClassDeclaration::search('%s')\n", toChars(), ident->toChars());
-    if (scope)
-
+
+
+
+
+
-
-    if (!members || !symtab || scope)
-
+
+
-    //*(char*)0=0;
-    return NULL;
@@ -1038 +1051 @@
-    if (inuse)
-    return;
-
-
-
-
+
+
+
+
+
+
+
+
+
-    if (!members)           // if forward reference
-    {   //printf("\tinterface '%s' is forward referenced\n", toChars());

dmd2/cond.c

@@ -144 +144 @@
-    "none",
-
-
+
-    "LLVM", "LDC", "LLVM64",
-    "PPC", "PPC64",
-    "darwin","solaris","freebsd"
+#endif
-    };
-

dmd2/constfold.c

@@ -854 +854 @@
-    int cmp;
-
-
-
-
+
+
+
+
+
+
+
-    }
-    else if (e1->op == TOKsymoff && e2->op == TOKsymoff)

dmd2/declaration.c

@@ -464 +464 @@
-    goto L2;            // it's a symbolic alias
-
+#if DMDV2
-    if (storage_class & STCref)
-    {   // For 'ref' to be attached to function types, and picked
@@ -473 +474 @@
-    }
-    else
+#endif
-    type->resolve(loc, sc, &e, &t, &s);
-    if (s)
@@ -489 +491 @@
-    }
-    else if (t)
+    {
-    type = t;
+    }
-    if (overnext)
-    ScopeDsymbol::multiplyDefined(0, this, overnext);
@@ -512 +516 @@
-        {
-        FuncAliasDeclaration *fa = new FuncAliasDeclaration(f);
+#if IN_LLVM
-        fa->importprot = importprot;
+#endif
-        if (!fa->overloadInsert(overnext))
-            ScopeDsymbol::multiplyDefined(0, f, overnext);
@@ -528 +534 @@
-    }
-    }
+    //printf("setting aliassym %p to %p\n", this, s);
-    aliassym = s;
-    this->inSemantic = 0;
@@ -625 +632 @@
-    offset = 0;
-    noauto = 0;
+#if DMDV1
+    nestedref = 0;
+#endif
-    ctorinit = 0;
-    aliassym = NULL;
@@ -630 +640 @@
-    canassign = 0;
-    value = NULL;
-    scope = NULL;
-#if IN_LLVM
-    aggrIndex = 0;
@@ -731 +740 @@
-    //printf("storage_class = x%x\n", storage_class);
-
+#if DMDV2
-    if (storage_class & STCgshared && global.params.safe && !sc->module->safe)
-    {
-    error("__gshared not allowed in safe mode; use shared");
-    }
+#endif
-
-    Dsymbol *parent = toParent();
@@ -852 +863 @@
-        aad = parent->isAggregateDeclaration();
-    if (aad)
-
+
+
+
-
-        if (storage_class & (STCconst | STCimmutable) && init)
@@ -860 +873 @@
-        }
-        else
+#endif
-        aad->addField(sc, this);
-    }
@@ -892 +906 @@
-    }
-
+#if DMDV2
-    if ((storage_class & (STCref | STCparameter | STCforeach)) == STCref &&
-    ident != Id::This)
@@ -897 +912 @@
-    error("only parameters or foreach declarations can be ref");
-    }
+#endif
-
-    if (type->isauto() && !noauto)
@@ -941 +957 @@
-        e1 = new VarExp(loc, this);
-        e = new AssignExp(loc, e1, e);
+#if DMDV2
-        e->op = TOKconstruct;
+#endif
-        e->type = e1->type;     // don't type check this, it would fail
-        init = new ExpInitializer(loc, e);
@@ -962 +980 @@
-        init = getExpInitializer();
-    }
+#if DMDV2
-    // Default initializer is always a blit
-    op = TOKblit;
+#endif
-    }
-
@@ -1041 +1061 @@
-        {
-            ei->exp = ei->exp->semantic(sc);
-
+
-            /* Look to see if initializer is a call to the constructor
-             */
@@ -1079 +1099 @@
-            }
-            }
-
+
-            if (!ei->exp->implicitConvTo(type))
-            {   Type *ti = ei->exp->type->toBasetype();
@@ -1133 +1153 @@
-            if (global.gag == 0)
-            global.errors = errors; // act as if nothing happened
-
+
-            /* Save scope for later use, to try again
-             */
-            scope = new Scope(*sc);
-            scope->setNoFree();
+#endif
-        }
-        else if (ei)
@@ -1151 +1172 @@
-            ei->exp = e;        // no errors, keep result
-            }
+#if DMDV2
-            else
-            {
@@ -1158 +1180 @@
-            scope->setNoFree();
-            }
+#endif
-        }
-        else
@@ -1221 +1244 @@
-    if (init)
-    {   buf->writestring(" = ");
+#if DMDV2
-    ExpInitializer *ie = init->isExpInitializer();
-    if (ie && (ie->exp->op == TOKconstruct || ie->exp->op == TOKblit))
-        ((AssignExp *)ie->exp)->e2->toCBuffer(buf, hgs);
-    else
+#endif
-        init->toCBuffer(buf, hgs);
-    }
@@ -1589 +1614 @@
-{
-    assert(linkage == LINKc);
-
+
-    if (!global.params.useAvailableExternally)
-        availableExternally = false;
+#endif
-}
-

dmd2/declaration.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -270 +270 @@
-    Expression *value;      // when interpreting, this is the value
-                // (NULL if value not determinable)
-    Scope *scope;       // !=NULL means context to use
-
-    VarDeclaration(Loc loc, Type *t, Identifier *id, Initializer *init);
@@ -669 +668 @@
-                    // this one is overriding
-    int inferRetType;           // !=0 if return type is to be inferred
-    Scope *scope;           // !=NULL means context to use
-
-    // Things that should really go into Scope

dmd2/dsymbol.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -49 +49 @@
-    this->loc = 0;
-    this->comment = NULL;
+    this->scope = NULL;
-
-#if IN_LLVM
@@ -68 +69 @@
-    this->loc = 0;
-    this->comment = NULL;
+    this->scope = NULL;
-
-#if IN_LLVM
@@ -194 +196 @@
-        break;
-    q--;
+#if TARGET_NET
+    if (AggregateDeclaration* ad = p->isAggregateDeclaration())
+    {
+        if (ad->isNested() && p->parent && p->parent->isAggregateDeclaration())
+        {
+            *q = '/';
+            continue;
+        }
+    }
+#endif
-    *q = '.';
-    }
@@ -270 +282 @@
-}
-
+/*************************************
+ * Set scope for future semantic analysis so we can
+ * deal better with forward references.
+ */
+
+void Dsymbol::setScope(Scope *sc)
+{
+    //printf("Dsymbol::setScope() %p %s\n", this, toChars());
+    if (!sc->nofree)
+    sc->setNoFree();        // may need it even after semantic() finishes
+    scope = sc;
+}
+
+/*************************************
+ * Does semantic analysis on the public face of declarations.
+ */
+
-void Dsymbol::semantic(Scope *sc)
-{
@@ -275 +304 @@
-}
-
+/*************************************
+ * Does semantic analysis on initializers and members of aggregates.
+ */
+
-void Dsymbol::semantic2(Scope *sc)
-{
@@ -280 +313 @@
-}
-
+/*************************************
+ * Does semantic analysis on function bodies.
+ */
+
-void Dsymbol::semantic3(Scope *sc)
-{
@@ -285 +322 @@
-}
-
+/*************************************
+ * Look for function inlining possibilities.
+ */
+
-void Dsymbol::inlineScan()
-{
-have no further semantic analysis needed
+aren't functions
-}
-
@@ -345 +386 @@
-        }
-        ti->tempdecl = td;
-done
+Run
-        ti->semantic(sc);
-        sm = ti->toAlias();

dmd2/dsymbol.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -75 +75 @@
-struct HdrGenState;
-struct OverloadSet;
+#if TARGET_NET
+struct PragmaScope;
+#endif
-#if IN_LLVM
-struct TypeInfoDeclaration;
-struct ClassInfoDeclaration;
-#endif
-
-#if IN_DMD
-struct Symbol;
-#endif
-
@@ -127 +126 @@
-    unsigned char *comment; // documentation comment for this Dsymbol
-    Loc loc;            // where defined
+    Scope *scope;       // !=NULL means context to use for semantic()
-
-    Dsymbol();
@@ -152 +152 @@
-    virtual Dsymbol *toAlias();         // resolve real symbol
-    virtual int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
+    virtual void setScope(Scope *sc);
-    virtual void semantic(Scope *sc);
-    virtual void semantic2(Scope *sc);
@@ -246 +247 @@
-    virtual TypeInfoDeclaration* isTypeInfoDeclaration() { return NULL; }
-    virtual ClassInfoDeclaration* isClassInfoDeclaration() { return NULL; }
-
+
+
+
-#if IN_LLVM
-    /// Codegen traversal

dmd2/enum.c

@@ -34 +34 @@
-    sinit = NULL;
-#endif
-    scope = NULL;
-    isdeprecated = 0;
-}

dmd2/enum.h

@@ -41 +41 @@
-    Expression *minval;
-    Expression *defaultval; // default initializer
-
-    Scope *scope;       // !=NULL means context to use
-#endif
-    int isdeprecated;

dmd2/expression.c

@@ -380 +380 @@
-    }
-
+    }
+    else if (e->op == TOKdottd)
+    {
+    e = new CallExp(e->loc, e);
+    e = e->semantic(sc);
-    }
-    return e;
@@ -1003 +1008 @@
-    halt();
-#endif
-int32
+error
-    }
-}
@@ -1065 +1070 @@
-{
-    error("expression %s is not a valid template value argument", toChars());
+#ifdef DEBUG
+dump(0);
+#endif
-}
-
@@ -1117 +1125 @@
-    if (!type->isscalar())
-    error("'%s' is not a scalar, it is a %s", toChars(), type->toChars());
+    rvalue();
-}
-
@@ -1131 +1140 @@
-    return new ErrorExp();
-    }
+    rvalue();
-    return this;
-}
@@ -1140 +1150 @@
-    return new ErrorExp();
-    }
+    rvalue();
-    return this;
-}
@@ -1997 +2008 @@
-    if (withsym)
-    {
+#if DMDV2
+        /* Disallow shadowing
+         */
+        // First find the scope of the with
+        Scope *scwith = sc;
+        while (scwith->scopesym != scopesym)
+        {   scwith = scwith->enclosing;
+        assert(scwith);
+        }
+        // Look at enclosing scopes for symbols with the same name,
+        // in the same function
+        for (Scope *scx = scwith; scx && scx->func == scwith->func; scx = scx->enclosing)
+        {   Dsymbol *s2;
+
+        if (scx->scopesym && scx->scopesym->symtab &&
+            (s2 = scx->scopesym->symtab->lookup(s->ident)) != NULL &&
+            s != s2)
+        {
+            error("with symbol %s is shadowing local symbol %s", s->toPrettyChars(), s2->toPrettyChars());
+        }
+        }
+#endif
-        s = s->toAlias();
-
@@ -2161 +2194 @@
-    {   type = v->type;
-        if (!v->type)
-"
+ %s", v->kind()
-        type = Type::terror;
-        }
@@ -2179 +2212 @@
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
+
+    if (!f->type->deco)
+    {
+        error("forward reference to %s", toChars());
+    }
-    return new VarExp(loc, f, hasOverloads);
-    }
@@ -2238 +2276 @@
-    TemplateInstance *ti = s->isTemplateInstance();
-    if (ti && !global.errors)
-done
+Run
-        ti->semantic(sc);
-    s = ti->inst->toAlias();
@@ -2927 +2965 @@
-    {   e = (Expression *)elements->data[i];
-    e = e->semantic(sc);
+    assert(e->type);
-    elements->data[i] = (void *)e;
-    }
@@ -3406 +3445 @@
-}
-
+void TypeExp::rvalue()
+{
+    error("type %s has no value", toChars());
+}
+
-void TypeExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3441 +3485 @@
-    if (ti && !global.errors)
-    {   Dsymbol *s;
-done
+Run
-        ti->semantic(sc);
-    s = ti->inst->toAlias();
@@ -3656 +3700 @@
-#endif
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {   /* The nested class cd is nested inside a function,
-         * we'll let getEthis() look for errors.
@@ -3665 +3728 @@
-            error("e.new is only for allocating nested classes");
-        }
+#endif
-        else
-        assert(0);
@@ -4029 +4093 @@
-#endif
-    }
+
-    /* Fix for 1161 doesn't work because it causes protection
-     * problems when instantiating imported templates passing private
@@ -4110 +4175 @@
-    }
-#endif
+
-    return this;
-}
@@ -4296 +4362 @@
-    }
-    type = new TypeTuple(exps);
+    type = type->semantic(loc, sc);
-    //printf("-TupleExp::semantic(%s)\n", toChars());
-    return this;
@@ -6160 +6227 @@
-    {   ScopeExp *se = (ScopeExp *)e1;
-    TemplateInstance *ti = se->sds->isTemplateInstance();
-done
+Run
-    {
-        /* Attempt to instantiate ti. If that works, go with it.
@@ -6188 +6255 @@
-    {   DotTemplateInstanceExp *se = (DotTemplateInstanceExp *)e1;
-    TemplateInstance *ti = se->ti;
-done
+Run
-    {
-        /* Attempt to instantiate ti. If that works, go with it.
@@ -6796 +6863 @@
-    : UnaExp(loc, TOKaddress, sizeof(AddrExp), e)
-{
+#if IN_LLVM
-    m = NULL;
+#endif
-}
-
@@ -6806 +6875 @@
-    if (!type)
-    {
+#if IN_LLVM
-    m = sc->module;
+#endif
-    UnaExp::semantic(sc);
-    e1 = e1->toLvalue(sc, NULL);
@@ -6812 +6883 @@
-    {
-        error("cannot take address of %s", e1->toChars());
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    type = e1->type->pointerTo();
-
@@ -6879 +6963 @@
-    : UnaExp(loc, TOKstar, sizeof(PtrExp), e)
-{
-
-
+//
+//
-}
-
@@ -6890 +6974 @@
-
-Expression *PtrExp::semantic(Scope *sc)
-
-
+
-#if LOGSEMANTIC
-    printf("PtrExp::semantic('%s')\n", toChars());
@@ -6904 +6987 @@
-    if (e)
-        return e;
-
+Type *
-    switch (tb->ty)
-    {
@@ -6919 +7002 @@
-        default:
-        error("can only * a pointer, not a '%s'", e1->type->toChars());
-
-
+
-    }
-    rvalue();
@@ -9745 +9827 @@
-#endif
-    else
+    {   e1->rvalue();
+    e2->rvalue();
-    e = this;
-
+
+
-    return e;
-}

dmd2/expression.h

@@ -86 +86 @@
-int arrayExpressionCanThrow(Expressions *exps);
-
+struct IntRange
+{   uinteger_t imin;
+    uinteger_t imax;
+};
+
-struct Expression : Object
-{
@@ -123 +128 @@
-    virtual Expression *implicitCastTo(Scope *sc, Type *t);
-    virtual MATCH implicitConvTo(Type *t);
+    virtual IntRange getIntRange();
-    virtual Expression *castTo(Scope *sc, Type *t);
-    virtual void checkEscape();
@@ -192 +198 @@
-    char *toChars();
-    void dump(int indent);
+    IntRange getIntRange();
-    dinteger_t toInteger();
-    real_t toReal();
@@ -559 +566 @@
-    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);
+    void rvalue();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Expression *optimize(int result);
@@ -1231 +1239 @@
-    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);
+    MATCH implicitConvTo(Type *t);
+    IntRange getIntRange();
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
@@ -1335 +1345 @@
-    Expression *semantic(Scope *sc);
-    void checkEscape();
+    IntRange getIntRange();
-    int isLvalue();
-    Expression *toLvalue(Scope *sc, Expression *e);
@@ -1340 +1351 @@
-    int isBool(int result);
-    int checkSideEffect(int flag);
+    MATCH implicitConvTo(Type *t);
+    Expression *castTo(Scope *sc, Type *t);
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
@@ -1553 +1566 @@
-    void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
-    Expression *buildArrayLoop(Arguments *fparams);
+    IntRange getIntRange();
-
-    // For operator overloading
@@ -1595 +1609 @@
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
+    IntRange getIntRange();
-
-    // For operator overloading
@@ -1615 +1630 @@
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
+    IntRange getIntRange();
-
-    // For operator overloading
@@ -1635 +1651 @@
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
+    IntRange getIntRange();
-
-    // For operator overloading
@@ -1657 +1674 @@
-    void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
-    Expression *buildArrayLoop(Arguments *fparams);
+    IntRange getIntRange();
-
-    // For operator overloading
@@ -1680 +1698 @@
-    void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
-    Expression *buildArrayLoop(Arguments *fparams);
+    MATCH implicitConvTo(Type *t);
+    IntRange getIntRange();
-
-    // For operator overloading
@@ -1703 +1723 @@
-    void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
-    Expression *buildArrayLoop(Arguments *fparams);
+    MATCH implicitConvTo(Type *t);
+    IntRange getIntRange();
-
-    // For operator overloading

dmd2/func.c

@@ -1 +1 @@
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -65 +65 @@
-    cantInterpret = 0;
-    semanticRun = 0;
+#if DMDV1
+    nestedFrameRef = 0;
+#endif
-    fes = NULL;
-    introducing = 0;
@@ -72 +75 @@
-     */
-    inferRetType = (type && type->nextOf() == NULL);
-    scope = NULL;
-    hasReturnExp = 0;
-    nrvo_can = 1;
@@ -79 +81 @@
-    shidden = NULL;
-#endif
-
+
-    builtin = BUILTINunknown;
-    tookAddressOf = 0;
-
+
-#if IN_LLVM
-    // LDC
@@ -126 +128 @@
-    assert(!fthrows); // deprecated
-
-
+
-    f->intrinsicName = intrinsicName;
+#endif
-
-    return f;
@@ -167 +170 @@
-    if (!originalType)
-    originalType = type;
- && type->nextOf()
+
-    {
-    /* Apply const and invariant storage class
@@ -305 +308 @@
-
-    if (isCtorDeclaration() ||
+#if DMDV2
-        isPostBlitDeclaration() ||
+#endif
-        isDtorDeclaration() ||
-        isInvariantDeclaration() ||
@@ -879 +884 @@
-        {   Argument *arg = (Argument *)f->parameters->data[i];
-
+        //printf("[%d] arg->type->ty = %d %s\n", i, arg->type->ty, arg->type->toChars());
-        if (arg->type->ty == Ttuple)
-        {   TypeTuple *t = (TypeTuple *)arg->type;
@@ -1009 +1015 @@
-        v = new VarDeclaration(loc, type->nextOf(), outId, NULL);
-        v->noauto = 1;
+#if DMDV2
+        if (f->isref)
+        {
+            v->storage_class |= STCref | STCforeach;
+        }
+#endif
-        sc2->incontract--;
-        v->semantic(sc2);
@@ -1109 +1121 @@
-
-        fbody = fbody->semantic(sc2);
+        if (!fbody)
+        fbody = new CompoundStatement(0, new Statements());
-
-        if (inferRetType)
@@ -1186 +1200 @@
-        else if (!inlineAsm)
-        {
-0
+BEfallthru
-        if (f->isnothrow && blockexit & BEthrow)
-            error("'%s' is nothrow yet may throw", toChars());
@@ -1205 +1219 @@
-            {   Expression *e;
-
-
+
+
-
-            if (global.params.useAssert &&
@@ -2170 +2185 @@
-
-void FuncDeclaration::appendState(Statement *s)
-
-
+
-    if (!fbody)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -2636 +2657 @@
-/********************************* PostBlitDeclaration ****************************/
-
+#if DMDV2
-PostBlitDeclaration::PostBlitDeclaration(Loc loc, Loc endloc)
-    : FuncDeclaration(loc, endloc, Id::_postblit, STCundefined, NULL)
@@ -2705 +2727 @@
-    bodyToCBuffer(buf, hgs);
-}
+#endif
-
-/********************************* DtorDeclaration ****************************/

dmd2/import.c

@@ -22 +22 @@
-#include "declaration.h"
-#include "id.h"
+#include "attrib.h"
-
-/********************************* Import ****************************/
@@ -101 +102 @@
-    if (s)
-    {
+#if TARGET_NET
+        mod = (Module *)s;
+#else
-    if (s->isModule())
-        mod = (Module *)s;
-    else
-        error("package and module have the same name");
+#endif
-    }
-
@@ -122 +127 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        case '(':
-        case ')':
-        case '\\':
-
-
-
+
-        default:
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-void Import::semantic(Scope *sc)
@@ -165 +168 @@
-    //printf("%s imports %s\n", sc->module->toChars(), mod->toChars());
-    sc->module->aimports.push(mod);
-
-    mod->semantic();
-
-    if (!isstatic && !aliasId && !names.dim)
@@ -178 +179 @@
-    }
-
+    mod->semantic();
+
-    if (mod->needmoduleinfo)
-        sc->module->needmoduleinfo = 1;
@@ -194 +197 @@
-    sc = sc->pop();
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        ob->printf("%s.", pid->toChars());
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
+
+
+
+
+
+
-
-    ob->writenl();
-    }
+
+   //printf("-Import::semantic('%s'), pkg = %p\n", toChars(), pkg);
-}
-
@@ -348 +359 @@
-    }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    buf->writenl();
-}

dmd2/import.h

@@ -35 +35 @@
-    Identifier *aliasId;
-    int isstatic;       // !=0 if static import
+#if IN_LLVM
-    enum PROT protection;
+#endif
-
-    // Pairs of alias=name to bind into current namespace
@@ -51 +53 @@
-
-    const char *kind();
+#if IN_LLVM
-    enum PROT prot();
+#endif
-    Dsymbol *syntaxCopy(Dsymbol *s);    // copy only syntax trees
-    void load(Scope *sc);

dmd2/inifile.c

@@ -15 +15 @@
-#include    <stdlib.h>
-#include    <ctype.h>
+
+#if _WIN32
+#include <windows.h>
+#endif
-
-#if __APPLE__
@@ -92 +96 @@
-        if (!FileName::exists(filename))
-        {
+#if _WIN32 // This fix by Tim Matthews
+        char resolved_name[MAX_PATH + 1];
+        if(GetModuleFileName(NULL, resolved_name, MAX_PATH + 1) && FileName::exists(resolved_name))
+        {
+            filename = (char *)FileName::replaceName(resolved_name, inifile);
+            if(FileName::exists(filename))
+                goto Ldone;
+        }
+#endif
-        filename = (char *)FileName::replaceName(argv0, inifile);
-        if (!FileName::exists(filename))

dmd2/init.c

@@ -397 +397 @@
-    Expression *e;
-
-\n"
+, dim = %d\n", dim
-    //static int i; if (++i == 2) halt();
+
+    size_t edim;
+    Type *t = NULL;
+    if (type)
+    {
+    t = type->toBasetype();
+    switch (t->ty)
+    {
+       case Tsarray:
+           edim = ((TypeSArray *)t)->dim->toInteger();
+           break;
+
+       case Tpointer:
+       case Tarray:
+           edim = dim;
+           break;
+
+       default:
+           assert(0);
+    }
+    }
+    else
+    edim = value.dim;
+
-    elements = new Expressions();
-
+
+
-    {
-    if (index.data[i])
-
+
+
-    Initializer *iz = (Initializer *)value.data[i];
-    if (!iz)
@@ -409 +435 @@
-    Expression *ex = iz->toExpression();
-    if (!ex)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    e->type = type;
-    return e;
+    }
-
-Lno:
@@ -467 +513 @@
-Type *ArrayInitializer::inferType(Scope *sc)
-{
+    //printf("ArrayInitializer::inferType() %s\n", toChars());
+    type = Type::terror;
-    for (size_t i = 0; i < value.dim; i++)
-    {
@@ -472 +520 @@
-        goto Lno;
-    }
-if (value.dim
-
-0
+for (size_t i = 0; i < value.dim; i++
+
+i
-    if (iz)
-    {   Type *t = iz->inferType(sc);
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-Lno:

dmd2/interpret.c

@@ -2294 +2294 @@
-    AssocArrayLiteralExp *aae = (AssocArrayLiteralExp *)earg;
-    Expression *e = new ArrayLiteralExp(aae->loc, aae->keys);
+    Type *elemType = ((TypeAArray *)aae->type)->index;
+    e->type = new TypeSArray(elemType, new IntegerExp(arguments ? arguments->dim : 0));
-    return e;
-}
@@ -2310 +2312 @@
-    AssocArrayLiteralExp *aae = (AssocArrayLiteralExp *)earg;
-    Expression *e = new ArrayLiteralExp(aae->loc, aae->values);
+    Type *elemType = ((TypeAArray *)aae->type)->next;
+    e->type = new TypeSArray(elemType, new IntegerExp(arguments ? arguments->dim : 0));
-    //printf("result is %s\n", e->toChars());
-    return e;

dmd2/lexer.c

@@ -1279 +1279 @@
-            }
-            if (ndigits != 2 && !utf_isValidDchar(v))
-
+
+
+
-            c = v;
-        }

dmd2/mangle.c

@@ -114 +114 @@
-            break;
-
-
+
-        case LINKintrinsic:
-
+
-        case LINKc:
-        case LINKwindows:

dmd2/mars.c

@@ -99 +99 @@
-#endif
-    ;
-0
+1
-#if IN_LLVM
-    ldc_version = LDC_REV;

dmd2/mars.h

@@ -210 +210 @@
-
-    const char *xmlname;    // filename for XML output
-
-OutBuffer *moduleDeps; // buffer and filename for emitting module deps
-char *moduleDepsFile;
-  
+
+char *moduleDepsFile;  // filename for deps output
+OutBuffer *moduleDeps; // contents to be written to deps file
+
-    // Hidden debug switches
-    bool debuga;
@@ -444 +444 @@
-#define stdmsg stderr
-#else
-out
+err
-#endif
-

dmd2/module.c

@@ -100 +100 @@
-    searchCacheFlags = 0;
-    semanticstarted = 0;
-done
+Run
-    decldefs = NULL;
-    vmoduleinfo = NULL;
@@ -771 +771 @@
-    symtab = new DsymbolTable();
-    for (i = 0; i < members->dim; i++)
-
-
-
+
-    s->addMember(NULL, sc->scopesym, 1);
+    }
+
+    /* Set scope for the symbols so that if we forward reference
+     * a symbol, it can possibly be resolved on the spot.
+     * If this works out well, it can be extended to all modules
+     * before any semantic() on any of them.
+     */
+    for (i = 0; i < members->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)members->data[i];
+    s->setScope(sc);
-    }
-
-    // Pass 1 semantic routines: do public side of the definition
-    for (i = 0; i < members->dim; i++)
-
-
-
+
+
-    //printf("\tModule('%s'): '%s'.semantic()\n", toChars(), s->toChars());
-    s->semantic(sc);
@@ -788 +795 @@
-
-    sc = sc->pop();
-
-done
+     // 2 pops because Scope::createGlobal() created 2
+Run
-    //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
-}
@@ -828 +835 @@
-    sc = sc->pop();
-    sc->pop();
-done
+Run
-    //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent);
-}
@@ -858 +865 @@
-    sc = sc->pop();
-    sc->pop();
-done
+Run
-}
-
@@ -883 +890 @@
-    s->inlineScan();
-    }
-done
+Run
-}
-
@@ -1144 +1151 @@
-        {
-        assert(p->isPackage());
+#if TARGET_NET  //dot net needs modules and packages with same name
+#else
-        if (p->isModule())
-        {   p->error("module and package have the same name");
@@ -1149 +1158 @@
-            break;
-        }
+#endif
-        }
-        parent = p;

dmd2/module.h

@@ -92 +92 @@
-
-    int semanticstarted;    // has semantic() been started?
-done
+Run
-    int root;           // != 0 if this is a 'root' module,
-                // i.e. a module that will be taken all the

dmd2/mtype.c

@@ -1172 +1172 @@
-    if (sv->ptrvalue)
-    {   t = (Type *) sv->ptrvalue;
+#ifdef DEBUG
+        if (!t->deco)
+        printf("t = %s\n", t->toChars());
+#endif
-        assert(t->deco);
-        //printf("old value, deco = '%s' %p\n", t->deco, t->deco);
@@ -1325 +1329 @@
- * to type 'to'.
- * Returns:
-
-
-
+
- */
-
@@ -1333 +1335 @@
-{
-    //printf("Type::implicitConvTo(this=%p, to=%p)\n", this, to);
+    //printf("from: %s\n", toChars());
+    //printf("to  : %s\n", to->toChars());
-    if (this == to)
-    return MATCHexact;
@@ -1592 +1596 @@
-}
-
+/****************************************
+ * Return the mask that an integral type will
+ * fit into.
+ */
+uinteger_t Type::sizemask()
+{   uinteger_t m;
+
+    switch (toBasetype()->ty)
+    {
+    case Tbool: m = 1;              break;
+    case Tchar:
+    case Tint8:
+    case Tuns8: m = 0xFF;           break;
+    case Twchar:
+    case Tint16:
+    case Tuns16:    m = 0xFFFFUL;           break;
+    case Tdchar:
+    case Tint32:
+    case Tuns32:    m = 0xFFFFFFFFUL;       break;
+    case Tint64:
+    case Tuns64:    m = 0xFFFFFFFFFFFFFFFFULL;  break;
+    default:
+        assert(0);
+    }
+    return m;
+}
+
-/* ============================= TypeNext =========================== */
-
@@ -1611 +1642 @@
-{
-    Type::checkDeprecated(loc, sc);
-
+
+
-}
-
@@ -1633 +1665 @@
-    }    
-    TypeNext *t = (TypeNext *)Type::makeConst();
-
+
+
-        !next->isInvariant() && !next->isConst())
-    {   if (next->isShared())
@@ -1652 +1685 @@
-    }
-    TypeNext *t = (TypeNext *)Type::makeInvariant();
-
+
+
-    !next->isInvariant())
-    {   t->next = next->invariantOf();
@@ -1667 +1701 @@
-    }    
-    TypeNext *t = (TypeNext *)Type::makeShared();
-
+
+
-        !next->isInvariant() && !next->isShared())
-    {
@@ -1687 +1722 @@
-    }    
-    TypeNext *t = (TypeNext *)Type::makeSharedConst();
-
+
+
-        !next->isInvariant() && !next->isSharedConst())
-    {
@@ -2362 +2398 @@
-    return MATCHexact;
-
+#if DMDV2
-    if (ty == to->ty)
-    {
-    return (mod == to->mod) ? MATCHexact : MATCHconst;
-    }
+#endif
-
-    if (ty == Tvoid || to->ty == Tvoid)
-    return MATCHnomatch;
-
-
-
-
-
-
-
-
-
-
+
+
-    if (!to->isTypeBasic())
-    return MATCHnomatch;
@@ -2389 +2419 @@
-        return MATCHnomatch;
-
-
-
+
+
+
-    {   d_uns64 sz = size(0);
-        d_uns64 tosz = tob->size(0);
-
- or, if same size, change sign
+
-         */
-        if (sz > tosz)
-        return MATCHnomatch;
-
+        /* Can't change sign if same size
+         */
-        /*if (sz == tosz && (flags ^ tob->flags) & TFLAGSunsigned)
-        return MATCHnomatch;*/
-    }
+#endif
-    }
-    else if (flags & TFLAGSfloating)
@@ -3553 +3587 @@
-{
-    //printf("TypePointer::semantic()\n");
+    if (deco)
+    return this;
-    Type *n = next->semantic(loc, sc);
-    switch (n->toBasetype()->ty)
@@ -3562 +3598 @@
-    }
-    if (n != next)
+    {
-    deco = NULL;
+    }
-    next = n;
-    transitive();
@@ -3802 +3840 @@
-
-        if (!arg1->type->equals(arg2->type))
-
+
+
+
+
+
+
+
-        if ((arg1->storageClass & ~STCscope) != (arg2->storageClass & ~STCscope))
-        inoutmismatch = 1;
@@ -4058 +4102 @@
-        buf->writestring(" const");
-    if (mod & MODinvariant)
-nvariant
+mmutable
-    if (mod & MODshared)
-        buf->writestring(" shared");
@@ -4082 +4126 @@
-    //printf("TypeFunction::semantic() %s, sc->stc = %x\n", toChars(), sc->stc);
-
+    /* 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));
@@ -4102 +4150 @@
-
-    tf->linkage = sc->linkage;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (tf->parameters)
@@ -4169 +4215 @@
-    }
-    }
-
+
+
-
-    if (tf->inuse)
@@ -4771 +4818 @@
-
-void TypeIdentifier::resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps)
-   Dsymbol *s;
+
-    Dsymbol *scopesym;
-
-    //printf("TypeIdentifier::resolve(sc = %p, idents = '%s')\n", sc, toChars());
-
+Dsymbol *
-    resolveHelper(loc, sc, s, scopesym, pe, pt, ps);
-    if (*pt)
@@ -5242 +5289 @@
-{
-    //printf("TypeEnum::semantic() %s\n", toChars());
-
+//
-    return merge();
-}
@@ -5896 +5943 @@
-    TemplateInstance *ti = s->isTemplateInstance();
-    if (ti)
-done
+Run
-        ti->semantic(sc);
-    s = ti->inst->toAlias();
@@ -6135 +6182 @@
-{
-    //printf("TypeClass::semantic(%s)\n", sym->toChars());
-
-
+
+
+
-    return merge();
-}
@@ -6427 +6475 @@
-    TemplateInstance *ti = s->isTemplateInstance();
-    if (ti)
-done
+Run
-        ti->semantic(sc);
-    s = ti->inst->toAlias();

dmd2/mtype.h

@@ -307 +307 @@
-    //Type *next;
-    virtual Type *nextOf();
+    uinteger_t sizemask();
+
-
-    static void error(Loc loc, const char *format, ...) IS_PRINTF(2);
@@ -715 +717 @@
-
-    TypeEnum(EnumDeclaration *sym);
+    Type *syntaxCopy();
-    d_uns64 size(Loc loc);
-    unsigned alignsize();
-    char *toChars();
-    Type *syntaxCopy();
-    Type *semantic(Loc loc, Scope *sc);
-    Dsymbol *toDsymbol(Scope *sc);

dmd2/opover.c

@@ -199 +199 @@
-    }
-
+#if DMDV2
-    // Didn't find it. Forward to aliasthis
-    if (ad->aliasthis)
@@ -211 +212 @@
-        return e;
-    }
+#endif
-    }
-    return NULL;
@@ -442 +444 @@
-    }
-
+#if DMDV2
-    // Try alias this on first operand
-    if (ad1 && ad1->aliasthis)
@@ -467 +470 @@
-    return e;
-    }
-
+
-    return NULL;
-}

dmd2/optimize.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -806 +806 @@
-    Expression *e1 = this->e1->optimize(WANTvalue | (result & WANTinterpret));
-    e1 = fromConstInitializer(result, e1);
+    if (this->e1->op == TOKvar)
+    {   VarExp *ve = (VarExp *)this->e1;
+    if (ve->var->storage_class & STCmanifest)
+    {   /* We generally don't want to have more than one copy of an
+         * array literal, but if it's an enum we have to because the
+         * enum isn't stored elsewhere. See Bugzilla 2559
+         */
+        this->e1 = e1;
+    }
+    }
-    e2 = e2->optimize(WANTvalue | (result & WANTinterpret));
-    e = Index(type, e1, e2);

dmd2/parse.c

@@ -3145 +3145 @@
-    Statement *ifbody;
-    Statement *elsebody;
+    bool isfinal;
-    Loc loc = this->loc;
-
@@ -3246 +3247 @@
-    }
-
+    case TOKfinal:
+        if (peekNext() == TOKswitch)
+        {
+        nextToken();
+        isfinal = TRUE;
+        goto Lswitch;
+        }
+        goto Ldeclaration;
+
-    CASE_BASIC_TYPES:
-    case TOKtypedef:
@@ -3252 +3262 @@
-    case TOKauto:
-    case TOKextern:
-    case TOKfinal:
-    case TOKinvariant:
-#if DMDV2
@@ -3652 +3661 @@
-
-    case TOKswitch:
-
-
-
+
+
+
+
+
-        nextToken();
-        check(TOKlparen);
-
+Expression *
-        check(TOKrparen);
-
-
+Statement *
+, isfinal
-        break;
-    }
@@ -3668 +3679 @@
-        Statements *statements;
-        Array cases;    // array of Expression's
+        Expression *last = NULL;
-
-        while (1)
@@ -3679 +3691 @@
-        check(TOKcolon);
-
+#if DMDV2
+        /* case exp: .. case last:
+         */
+        if (token.value == TOKslice)
+        {
+        if (cases.dim > 1)
+            error("only one case allowed for start of case range");
+        nextToken();
+        check(TOKcase);
+        last = parseAssignExp();
+        check(TOKcolon);
+        }
+#endif
+
-        statements = new Statements();
-        while (token.value != TOKcase &&
@@ -3689 +3715 @@
-        s = new ScopeStatement(loc, s);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        break;
@@ -4025 +4060 @@
- *      1   identifier optional
- *      2   must have identifier
+ * Output:
+ *  if *pt is not NULL, it is set to the ending token, which would be endtok
- */
-
@@ -4063 +4100 @@
-
-Lis:
-\n"
+, t = %s\n", t->toChars()
-    return TRUE;
-
@@ -4358 +4395 @@
-{   // This code parallels parseParameters()
-    Token *t = *pt;
-    int tmp;
-
-    //printf("isParameters()\n");
@@ -4367 +4403 @@
-    for (;1; t = peek(t))
-    {
+     L1:
-    switch (t->value)
-    {
@@ -4381 +4418 @@
-        case TOKref:
-        case TOKlazy:
+        case TOKfinal:
+        continue;
+
-        case TOKconst:
-        case TOKinvariant:
-        case TOKimmutable:
-        case TOKshared:
-
-
+
+
+
+
+
+
+
+
+
+
-
-#if 0
@@ -4405 +4453 @@
-
-        default:
-
+    {
-            return FALSE;
-
+
+
-        if (t->value != TOKdotdotdot &&
-            !isDeclarator(&t, &tmp, TOKreserved))
@@ -4421 +4470 @@
-            break;
-        }
+        }
-        L3:
-        if (t->value == TOKcomma)

dmd2/root/async.c

@@ -62 +62 @@
-void AsyncRead::start()
-{
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-}
@@ -99 +103 @@
-    AsyncRead *aw = (AsyncRead *)p;
-
+    //printf("aw->filesdim = %p %d\n", aw, aw->filesdim);
-    for (size_t i = 0; i < aw->filesdim; i++)
-    {   FileData *f = &aw->files[i];

dmd2/scope.c

@@ -72 +72 @@
-    this->noctor = 0;
-    this->noaccesscheck = 0;
+    this->mustsemantic = 0;
-    this->intypeof = 0;
-    this->parameterSpecialization = 0;
@@ -120 +121 @@
-    this->noctor = enclosing->noctor;
-    this->noaccesscheck = enclosing->noaccesscheck;
+    this->mustsemantic = enclosing->mustsemantic;
-    this->intypeof = enclosing->intypeof;
-    this->parameterSpecialization = enclosing->parameterSpecialization;

dmd2/scope.h

@@ -72 +72 @@
-    int parameterSpecialization; // if in template parameter specialization
-    int noaccesscheck;      // don't do access checks
+    int mustsemantic;       // cannot defer semantic()
-
-    unsigned callSuper;     // primitive flow analysis for constructors

dmd2/statement.c

@@ -142 +142 @@
-{
-    //printf("Statement::comeFrom()\n");
+    return FALSE;
+}
+
+// Return TRUE if statement has no code in it
+int Statement::isEmpty()
+{
+    //printf("Statement::isEmpty()\n");
-    return FALSE;
-}
@@ -581 +588 @@
-}
-
+int CompoundStatement::isEmpty()
+{
+    for (int i = 0; i < statements->dim; i++)
+    {   Statement *s = (Statement *) statements->data[i];
+    if (s && !s->isEmpty())
+        return FALSE;
+    }
+    return TRUE;
+}
+
-
-/******************************** CompoundDeclarationStatement ***************************/
@@ -857 +874 @@
-}
-
+int ScopeStatement::isEmpty()
+{
+    //printf("ScopeStatement::isEmpty() %d\n", statement ? statement->isEmpty() : TRUE);
+    return statement ? statement->isEmpty() : TRUE;
+}
+
-void ScopeStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -1537 +1560 @@
-         */
-        Identifier *id = Identifier::generateId("__r");
-        aggr = aggr->semantic(sc);
-        Expression *rinit = new SliceExp(loc, aggr, NULL, NULL);
-        rinit = rinit->trySemantic(sc);
@@ -1871 +1893 @@
-
-        s = new CompoundStatement(loc, a);
-
+, FALSE
-        s = s->semantic(sc);
-        }
@@ -2547 +2569 @@
-/******************************** SwitchStatement ***************************/
-
-
+, bool isFinal
-    : Statement(loc)
-{
-
-
+
+
+
-    sdefault = NULL;
-    cases = NULL;
-    hasNoDefault = 0;
-    hasVars = 0;
-
+
-    enclosingScopeExit = NULL;
+#endif
-}
-
@@ -2563 +2587 @@
-{
-    SwitchStatement *s = new SwitchStatement(loc,
-
+, isFinal
-    return s;
-}
@@ -2572 +2596 @@
-    assert(!cases);     // ensure semantic() is only run once
-
-
+
-    enclosingScopeExit = sc->enclosingScopeExit;
+#endif
-
-    condition = condition->semantic(sc);
@@ -2663 +2688 @@
-    body = cs;
-    }
+
+#if DMDV2
+    if (isFinal)
+    {   Type *t = condition->type;
+    while (t->ty == Ttypedef)
+    {   // Don't use toBasetype() because that will skip past enums
+        t = ((TypeTypedef *)t)->sym->basetype;
+    }
+    if (condition->type->ty == Tenum)
+    {   TypeEnum *te = (TypeEnum *)condition->type;
+        EnumDeclaration *ed = te->toDsymbol(sc)->isEnumDeclaration();
+        assert(ed);
+        size_t dim = ed->members->dim;
+        for (size_t i = 0; i < dim; i++)
+        {
+        EnumMember *em = ((Dsymbol *)ed->members->data[i])->isEnumMember();
+        if (em)
+        {
+            for (size_t j = 0; j < cases->dim; j++)
+            {   CaseStatement *cs = (CaseStatement *)cases->data[j];
+            if (cs->exp->equals(em->value))
+                goto L1;
+            }
+            error("enum member %s not represented in final switch", em->toChars());
+        }
+          L1:
+        ;
+        }
+    }
+    }
+#endif
-
-    sc->pop();
@@ -2747 +2803 @@
-    if (sw)
-    {
-
+
-    enclosingScopeExit = sc->enclosingScopeExit;
-    if (enclosingScopeExit != sw->enclosingScopeExit)
@@ -2753 +2809 @@
-        error("case must be inside the same try, synchronized or volatile level as switch");
-    }
-
+
-    exp = exp->implicitCastTo(sc, sw->condition->type);
-    exp = exp->optimize(WANTvalue | WANTinterpret);
@@ -2768 +2824 @@
-         */
-        sw->hasVars = 1;
+        if (sw->isFinal)
+            error("case variables not allowed in final switch statements");
-        goto L1;
-        }
@@ -2846 +2904 @@
-    statement->toCBuffer(buf, hgs);
-}
+
+/******************************** CaseRangeStatement ***************************/
+
+#if DMDV2
+
+CaseRangeStatement::CaseRangeStatement(Loc loc, Expression *first,
+    Expression *last, Statement *s)
+    : Statement(loc)
+{
+    this->first = first;
+    this->last = last;
+    this->statement = s;
+}
+
+Statement *CaseRangeStatement::syntaxCopy()
+{
+    CaseRangeStatement *s = new CaseRangeStatement(loc,
+    first->syntaxCopy(), last->syntaxCopy(), statement->syntaxCopy());
+    return s;
+}
+
+Statement *CaseRangeStatement::semantic(Scope *sc)
+{   SwitchStatement *sw = sc->sw;
+
+    //printf("CaseRangeStatement::semantic() %s\n", toChars());
+    if (sw->isFinal)
+    error("case ranges not allowed in final switch");
+
+    first = first->semantic(sc);
+    first = first->implicitCastTo(sc, sw->condition->type);
+    first = first->optimize(WANTvalue | WANTinterpret);
+    dinteger_t fval = first->toInteger();
+
+    last = last->semantic(sc);
+    last = last->implicitCastTo(sc, sw->condition->type);
+    last = last->optimize(WANTvalue | WANTinterpret);
+    dinteger_t lval = last->toInteger();
+
+    if (lval - fval > 256)
+    {   error("more than 256 cases in case range");
+    lval = fval + 256;
+    }
+
+    /* This works by replacing the CaseRange with an array of Case's.
+     *
+     * case a: .. case b: s;
+     *    =>
+     * case a:
+     *   [...]
+     * case b:
+     *   s;
+     */
+
+    Statements *statements = new Statements();
+    for (dinteger_t i = fval; i <= lval; i++)
+    {
+    Statement *s = statement;
+    if (i != lval)
+        s = new ExpStatement(loc, NULL);
+    Expression *e = new IntegerExp(loc, i, first->type);
+    Statement *cs = new CaseStatement(loc, e, s);
+    statements->push(cs);
+    }
+    Statement *s = new CompoundStatement(loc, statements);
+    s = s->semantic(sc);
+    return s;
+}
+
+void CaseRangeStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("case ");
+    first->toCBuffer(buf, hgs);
+    buf->writestring(": .. case ");
+    last->toCBuffer(buf, hgs);
+    buf->writenl();
+    statement->toCBuffer(buf, hgs);
+}
+
+#endif
-
-/******************************** DefaultStatement ***************************/
@@ -2878 +3015 @@
-    sc->sw->sdefault = this;
-
-
+
-    enclosingScopeExit = sc->enclosingScopeExit;
-    if (enclosingScopeExit != sc->sw->enclosingScopeExit)
@@ -2884 +3021 @@
-        error("default must be inside the same try, synchronized or volatile level as switch");
-    }
+
+    if (sc->sw->isFinal)
+    {
+        error("default statement not allowed in final switch statement");
+    }
+#endif
-    }
-    else
@@ -3218 +3361 @@
-        // Construct: { vresult = exp; return cases.dim + 1; }
-        exp = new AssignExp(loc, new VarExp(0, fd->vresult), exp);
+        exp->op = TOKconstruct;
-        exp = exp->semantic(sc);
-        Statement *s1 = new ExpStatement(loc, exp);
@@ -3234 +3378 @@
-
-        exp = new AssignExp(loc, v, exp);
+        exp->op = TOKconstruct;
-        exp = exp->semantic(sc);
-    }
@@ -3758 +3903 @@
-    }
-
-
+
+
-    return NULL;
-
+
-    return this;
-}

dmd2/statement.h

@@ -129 +129 @@
-    virtual int blockExit();
-    virtual int comeFrom();
+    virtual int isEmpty();
-    virtual void scopeCode(Scope *sc, Statement **sentry, Statement **sexit, Statement **sfinally);
-    virtual Statements *flatten(Scope *sc);
@@ -147 +148 @@
-    virtual CaseStatement* isCaseStatement() { return NULL; }
-
-
+
-    virtual void toNakedIR(IRState *irs);
-    virtual AsmBlockStatement* endsWithAsm();
+#endif
-};
-
@@ -169 +171 @@
-    void toIR(IRState *irs);
-
-
+
-    void toNakedIR(IRState *irs);
+#endif
-};
-
@@ -210 +213 @@
-    int blockExit();
-    int comeFrom();
+    int isEmpty();
-    virtual Statements *flatten(Scope *sc);
-    ReturnStatement *isReturnStatement();
@@ -220 +224 @@
-    virtual void toIR(IRState *irs);
-
-
+
-    virtual void toNakedIR(IRState *irs);
-    virtual AsmBlockStatement* endsWithAsm();
+#endif
-
-    virtual CompoundStatement *isCompoundStatement() { return this; }
@@ -273 +278 @@
-    int blockExit();
-    int comeFrom();
+    int isEmpty();
-    Expression *interpret(InterState *istate);
-
@@ -480 +486 @@
-    Expression *condition;
-    Statement *body;
+    bool isFinal;
-
-    DefaultStatement *sdefault;
@@ -488 +495 @@
-    int hasVars;        // !=0 if has variable case values
-
-
+
-    Statement *enclosingScopeExit;
-
-
+
+
+
-    Statement *syntaxCopy();
-    Statement *semantic(Scope *sc);
@@ -509 +517 @@
-    Expression *exp;
-    Statement *statement;
+
-    int index;      // which case it is (since we sort this)
-    block *cblock;  // back end: label for the block
-
-
+
-    Statement *enclosingScopeExit;
+#endif
-
-    CaseStatement(Loc loc, Expression *exp, Statement *s);
@@ -531 +541 @@
-    CaseStatement* isCaseStatement() { return this; }
-
-
+
-    llvm::BasicBlock* bodyBB;
-    llvm::ConstantInt* llvmIdx;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-struct DefaultStatement : Statement
@@ -543 +570 @@
-#endif
-
-
+
-    Statement *enclosingScopeExit;
+#endif
-
-    DefaultStatement(Loc loc, Statement *s);
@@ -559 +587 @@
-    void toIR(IRState *irs);
-
-
+
-    llvm::BasicBlock* bodyBB;
+#endif
-};
-
@@ -635 +664 @@
-    void toIR(IRState *irs);
-
+#if IN_LLVM
-    // LDC: only set if ident is set: label statement to jump to
-    LabelStatement *target;
+#endif
-};
-
@@ -652 +683 @@
-    void toIR(IRState *irs);
-
+#if IN_LLVM
-    // LDC: only set if ident is set: label statement to jump to
-    LabelStatement *target;
+#endif
-};
-
@@ -676 +709 @@
-    SynchronizedStatement(Loc loc, elem *esync, Statement *body);
-    void toIR(IRState *irs);
+#if IN_LLVM
-    llvm::Value* llsync;
+#endif
-};
-
@@ -838 +873 @@
-    void toIR(IRState *irs);
-
-
+
-    bool asmLabel;       // for labels inside inline assembler
-    void toNakedIR(IRState *irs);
+#endif
-};
-
@@ -874 +910 @@
-    void toIR(IRState *irs);
-
-
+
-    // non-zero if this is a branch, contains the target labels identifier
-    Identifier* isBranchToLabel;
-
-    void toNakedIR(IRState *irs);
+#endif
-};
-

dmd2/struct.c

@@ -47 +47 @@
-    sinit = NULL;
-#endif
-    scope = NULL;
-    isnested = 0;
-    vthis = NULL;
@@ -71 +70 @@
-{
-    //printf("AggregateDeclaration::semantic2(%s)\n", toChars());
-
+ && members
-    {   error("has forward references");
-    return;
@@ -90 +89 @@
-{   int i;
-
-
+
-    if (!global.params.useAvailableExternally)
-        availableExternally = false;
+#endif
-
-    //printf("AggregateDeclaration::semantic3(%s)\n", toChars());
@@ -289 +289 @@
-
-    parent = sc->parent;
+    type = type->semantic(loc, sc);
-#if STRUCTTHISREF
-    handle = type;

dmd2/template.c

@@ -309 +309 @@
-    this->overnext = NULL;
-    this->overroot = NULL;
-cope = NULL
+emanticRun = 0
-    this->onemember = NULL;
-    this->literal = 0;
@@ -338 +338 @@
-
-#if IN_LLVM
-    // LDC
-    td->intrinsicName = intrinsicName;
-#endif
@@ -350 +349 @@
-    printf("TemplateDeclaration::semantic(this = %p, id = '%s')\n", this, ident->toChars());
-#endif
-cope
+emanticRun
-    return;     // semantic() already run
+    semanticRun = 1;
-
-    if (sc->func)
@@ -879 +879 @@
-    }
-
- 
-->dim
+ 
+ ? fargs->dim : 0
-
-    /* Check for match of function arguments with variadic template
@@ -1330 +1330 @@
-    for (TemplateDeclaration *td = this; td; td = td->overnext)
-    {
-cope
+emanticRun
-    {
-        error("forward reference to template %s", td->toChars());
@@ -3216 +3216 @@
-    this->argsym = NULL;
-    this->aliasdecl = NULL;
-done
+Run
-    this->semantictiargsdone = 0;
-    this->withsym = NULL;
@@ -3250 +3250 @@
-    this->argsym = NULL;
-    this->aliasdecl = NULL;
-done
+Run
-    this->semantictiargsdone = 1;
-    this->withsym = NULL;
@@ -3325 +3325 @@
-    tinst = sc->tinst;
-
-done
+Run
-    {
-    error(loc, "recursive template expansion");
@@ -3331 +3331 @@
-    return;
-    }
-done
+Run
-#if IN_LLVM
-    // get the enclosing template instance from the scope tinst
@@ -3475 +3475 @@
-        //printf("\t2: adding to module %s instead of module %s\n", m->toChars(), sc->module->toChars());
-        a = m->members;
-done
+Run
-        dosemantic3 = 1;
-    }
@@ -3496 +3496 @@
-    // Create our own scope for the template parameters
-    Scope *scope = tempdecl->scope;
-scope
-
-forward reference to template declaration %s\n"
+tempdecl->semanticRun
+
+template instantiation %s forward references template declaration %s\n", toChars()
-    return;
-    }
@@ -3718 +3718 @@
-        else if (ta)
-        {
+          Ltype:
-        if (ta->ty == Ttuple)
-        {   // Expand tuple
@@ -3753 +3754 @@
-        tiargs->data[j] = ea;
-        if (ea->op == TOKtype)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else if (sa)
-    {
-        TemplateDeclaration *td = sa->isTemplateDeclaration();
-cope
+emanticRun
-        td->semantic(sc);
-    }
@@ -3899 +3914 @@
-    printf("TemplateInstance::findBestMatch()\n");
-#endif
+    // First look for forward references
+    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
+    {
+    if (!td->semanticRun)
+    {
+        if (td->scope)
+        {   // Try to fix forward reference
+        td->semantic(td->scope);
+        }
+        if (!td->semanticRun)
+        {
+        error("%s forward references template declaration %s\n", toChars(), td->toChars());
+        return NULL;
+        }
+    }
+    }
+
-    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
-    {
@@ -3915 +3947 @@
-    dedtypes.setDim(td->parameters->dim);
-    dedtypes.zero();
-
-
-
-
-
+
-    m = td->matchWithInstance(this, &dedtypes, 0);
-    //printf("matchWithInstance = %d\n", m);
@@ -4213 +4241 @@
- */
-
-ope
+
-{
-    //printf("TemplateInstance::declareParameters()\n");
@@ -4223 +4251 @@
-
-    //printf("\ttdtypes[%d] = %p\n", i, o);
-ope
+
-    }
-}
@@ -4231 +4259 @@
-{   int i;
-
-done
+Run
-    return;
-done
+Run
-#if LOG
-    printf("+TemplateInstance::semantic2('%s')\n", toChars());
@@ -4263 +4291 @@
-{
-#if LOG
-done = %d\n", toChars(), semanticdone
+Run = %d\n", toChars(), semanticRun
-#endif
-//if (toChars()[0] == 'D') *(char*)0=0;
-done
+Run
-    return;
-done
+Run
-    if (!errors && members)
-    {
@@ -4458 +4486 @@
-    this->idents = idents;
-    this->tiargs = tiargs ? tiargs : new Objects();
-    this->scope = NULL;
-}
-
@@ -4492 +4519 @@
-    fflush(stdout);
-#endif
-done
+Run
-    // This for when a class/struct contains mixin members, and
-    // is done over because of forward references
@@ -4502 +4529 @@
-    return;
-    }
-done
-done
+Run
+Run
-#if LOG
-    printf("\tdo semantic\n");
@@ -4578 +4605 @@
-    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
-    {
-cope
+emanticRun
-    {
-        /* Cannot handle forward references if mixin is a struct member,
@@ -4586 +4613 @@
-         * semantic.
-         */
-done
+Run
-        AggregateDeclaration *ad = toParent()->isAggregateDeclaration();
-        if (ad)
@@ -4692 +4719 @@
-    argsym = new ScopeDsymbol();
-    argsym->parent = scy->parent;
-
+arg
-
-    unsigned errorsave = global.errors;
-
-    // Declare each template parameter as an alias for the argument type
-
+arg
-
-    // Add members to enclosing scope, as well as this scope
@@ -4704 +4731 @@
-
-    s = (Dsymbol *)members->data[i];
-
+arg
-    //sc->insert(s);
-    //printf("sc->parent = %p, sc->scopesym = %p\n", sc->parent, sc->scopesym);
@@ -4715 +4742 @@
-#endif
-    Scope *sc2;
-
+arg
-    sc2->offset = sc->offset;
-
@@ -4758 +4785 @@
-    sc2->pop();
-
-
+arg
-
-//    if (!isAnonymous())
@@ -4772 +4799 @@
-{   int i;
-
-done
+Run
-    return;
-done
+Run
-#if LOG
-    printf("+TemplateMixin::semantic2('%s')\n", toChars());
@@ -4802 +4829 @@
-{   int i;
-
-done
+Run
-    return;
-done
+Run
-#if LOG
-    printf("TemplateMixin::semantic3('%s')\n", toChars());

dmd2/template.h

@@ -62 +62 @@
-    TemplateDeclaration *overroot;  // first in overnext list
-
-
+
+
-    Dsymbol *onemember;     // if !=NULL then one member of this template
-
@@ -285 +286 @@
-                    // sole member
-    WithScopeSymbol *withsym;       // if a member of a with statement
-done
+Run
-    int semantictiargsdone; // has semanticTiargs() been done?
-    int nest;       // for recursion detection
@@ -343 +344 @@
-    Array *idents;
-    Type *tqual;
-
-    Scope *scope;       // for forward referencing
-
-    TemplateMixin(Loc loc, Identifier *ident, Type *tqual, Array *idents, Objects *tiargs);