Changeset 884

Timestamp:

03/08/08 17:29:17 (6 months ago)

Author:

Gregor

Message:

MERGE: dmdfe-2.0 r883 (DMD 2.012)

Files:

• trunk/rebuild/Makefile (modified) (1 diff)
• trunk/rebuild/access.c (modified) (1 diff)
• trunk/rebuild/aggregate.h (modified) (11 diffs)
• trunk/rebuild/attrib.c (modified) (4 diffs)
• trunk/rebuild/cast.c (modified) (30 diffs)
• trunk/rebuild/class.c (modified) (2 diffs)
• trunk/rebuild/clone.c (copied) (copied from branches/dmdfe-2.0/clone.c)
• trunk/rebuild/constfold.c (modified) (1 diff)
• trunk/rebuild/declaration.c (modified) (28 diffs)
• trunk/rebuild/declaration.h (modified) (5 diffs)
• trunk/rebuild/doc.c (modified) (10 diffs)
• trunk/rebuild/dsymbol.c (modified) (5 diffs)
• trunk/rebuild/dsymbol.h (modified) (4 diffs)
• trunk/rebuild/enum.c (modified) (12 diffs)
• trunk/rebuild/enum.h (modified) (3 diffs)
• trunk/rebuild/expression.c (modified) (81 diffs)
• trunk/rebuild/expression.h (modified) (15 diffs)
• trunk/rebuild/func.c (modified) (32 diffs)
• trunk/rebuild/idgen.c (modified) (4 diffs)
• trunk/rebuild/init.c (modified) (2 diffs)
• trunk/rebuild/interpret.c (modified) (14 diffs)
• trunk/rebuild/lexer.c (modified) (10 diffs)
• trunk/rebuild/lexer.h (modified) (5 diffs)
• trunk/rebuild/mangle.c (modified) (1 diff)
• trunk/rebuild/mars.c (modified) (4 diffs)
• trunk/rebuild/mtype.c (modified) (39 diffs)
• trunk/rebuild/mtype.h (modified) (6 diffs)
• trunk/rebuild/optimize.c (modified) (5 diffs)
• trunk/rebuild/parse.c (modified) (24 diffs)
• trunk/rebuild/parse.h (modified) (2 diffs)
• trunk/rebuild/scope.c (modified) (2 diffs)
• trunk/rebuild/scope.h (modified) (1 diff)
• trunk/rebuild/statement.c (modified) (59 diffs)
• trunk/rebuild/statement.h (modified) (35 diffs)
• trunk/rebuild/struct.c (modified) (5 diffs)
• trunk/rebuild/template.c (modified) (39 diffs)
• trunk/rebuild/template.h (modified) (1 diff)
• trunk/rebuild/traits.c (modified) (3 diffs)

trunk/rebuild/Makefile

@@ -21 +21 @@
-  cast.o \
-  class.o \
+  clone.o \
-  compile.o \
-  cond.o \

trunk/rebuild/access.c

@@ -254 +254 @@
-    {
-    //error(loc, "member %s is not accessible", smember->toChars());
+halt();
-    }
-}

trunk/rebuild/aggregate.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -58 +58 @@
-    DeleteDeclaration *aggDelete;   // deallocator
-
+    FuncDeclarations dtors; // Array of destructors
+    FuncDeclaration *dtor;  // aggregate destructor
+
-#ifdef IN_GCC
-    Array methods;              // flat list of all methods for debug information
@@ -71 +74 @@
-    void addField(Scope *sc, VarDeclaration *v);
-    int isDeprecated();     // is aggregate deprecated?
+    FuncDeclaration *buildDtor(Scope *sc);
-
-    void emitComment(Scope *sc);
@@ -103 +107 @@
-{
-    int zeroInit;       // !=0 if initialize with 0 fill
+    int hasIdentityAssign;  // !=0 if has identity opAssign
+    FuncDeclaration *cpctor;    // generated copy-constructor, if any
+
+    FuncDeclarations postblits; // Array of postblit functions
+    FuncDeclaration *postblit;  // aggregate postblit
-
-    StructDeclaration(Loc loc, Identifier *id);
@@ -110 +119 @@
-    char *mangle();
-    char *kind();
+    int needOpAssign();
+    FuncDeclaration *buildOpAssign(Scope *sc);
+    FuncDeclaration *buildPostBlit(Scope *sc);
+    FuncDeclaration *buildCpCtor(Scope *sc);
-    void toDocBuffer(OutBuffer *buf);
-
@@ -149 +162 @@
-};
-
+#if V2
-#define CLASSINFO_SIZE  (0x3C+16)   // value of ClassInfo.size
+#else
+#define CLASSINFO_SIZE  (0x3C+12)   // value of ClassInfo.size
+#endif
-
-struct ClassDeclaration : AggregateDeclaration
@@ -159 +176 @@
-    CtorDeclaration *ctor;
-    CtorDeclaration *defaultCtor;   // default constructor
-    FuncDeclarations dtors;     // Array of destructors
-    FuncDeclaration *staticCtor;
-    FuncDeclaration *staticDtor;
@@ -194 +210 @@
-
-    Dsymbol *search(Loc, Identifier *ident, int flags);
+#if V2
-    int isFuncHidden(FuncDeclaration *fd);
+#endif
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);
@@ -200 +218 @@
-    int isCOMclass();
-    virtual int isCOMinterface();
+#if V2
-    virtual int isCPPinterface();
+#endif
-    int isAbstract();
-    virtual int vtblOffset();
@@ -224 +244 @@
-struct InterfaceDeclaration : ClassDeclaration
-{
+#if V2
-    int cpp;                // !=0 if this is a C++ interface
-
+
-    InterfaceDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
@@ -233 +254 @@
-    char *kind();
-    int vtblOffset();
+#if V2
-    int isCPPinterface();
+#endif
-    virtual int isCOMinterface();
-

trunk/rebuild/attrib.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -35 +35 @@
-
-extern void obj_includelib(char *name);
+void obj_startaddress(Symbol *s);
-
-
@@ -308 +309 @@
-    {   unsigned stc_save = sc->stc;
-
-
-
-
-
+
+
+
+
+
+
+
-    sc->stc |= stc;
-    for (unsigned i = 0; i < decl->dim; i++)
@@ -824 +828 @@
-    }
-#endif
+    else if (ident == Id::startaddress)
+    {
+    if (!args || args->dim != 1)
+        error("function name expected for start address");
+    else
+    {
+        Expression *e = (Expression *)args->data[0];
+        e = e->semantic(sc);
+        e = e->optimize(WANTvalue | WANTinterpret);
+        args->data[0] = (void *)e;
+        Dsymbol *sa = getDsymbol(e);
+        if (!sa || !sa->isFuncDeclaration())
+        error("function name expected for start address, not '%s'", e->toChars());
+    }
+    goto Lnodecl;
+    }
-    else
-    error("unrecognized pragma(%s)", ident->toChars()); */

trunk/rebuild/cast.c

@@ -35 +35 @@
-    //printf("%s\n", toChars());
-
-
+
+
-    {
-    if (global.params.warnings &&
@@ -50 +51 @@
-        toChars(), type->toChars(), t->toChars());*/
-    }
+    if (match == MATCHconst && t == type->constOf())
+    {
+        Expression *e = copy();
+        e->type = t;
+        return e;
+    }
-    return castTo(sc, t);
-    }
@@ -58 +65 @@
-
-#if 0
+printf("ty = %d\n", type->ty);
-print();
-type->print();
@@ -96 +104 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
-1
+5
-    if (!type)
-    {   //error("%s is not an expression", toChars());
@@ -105 +113 @@
-    return MATCHexact;
-    if (e != this)
-optimized to %s\n", 
+\toptimized to %s of type %s\n", e->toChars(), e->typ
-    return e->implicitConvTo(t);
-    }
@@ -139 +147 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
-
-
+
+
+
-
-    TY ty = type->toBasetype()->ty;
-    TY toty = t->toBasetype()->ty;
-
-type->implicitConvTo(t)
+m
-    goto Lno;
-
@@ -333 +342 @@
-    if (this->type->equals(t))
-    return MATCHexact;
+
+    /* Allow implicit conversions from invariant to mutable|const,
+     * and mutable to invariant. It works because, after all, a null
+     * doesn't actually point to anything.
+     */
+    if (t->invariantOf()->equals(type->invariantOf()))
+    return MATCHconst;
+
-    // NULL implicitly converts to any pointer type or dynamic array
-    if (type->ty == Tpointer && type->nextOf()->ty == Tvoid)
@@ -344 +361 @@
-    }
-    return Expression::implicitConvTo(t);
+}
+
+MATCH StructLiteralExp::implicitConvTo(Type *t)
+{
+#if 0
+    printf("StructLiteralExp::implicitConvTo(this=%s, type=%s, t=%s)\n",
+    toChars(), type->toChars(), t->toChars());
+#endif
+    MATCH m = Expression::implicitConvTo(t);
+    if (m != MATCHnomatch)
+    return m;
+    if (type->ty == t->ty && type->ty == Tstruct &&
+    ((TypeStruct *)type)->sym == ((TypeStruct *)t)->sym)
+    {
+    m = MATCHconst;
+    for (int i = 0; i < elements->dim; i++)
+    {   Expression *e = (Expression *)elements->data[i];
+        Type *te = e->type;
+        if (t->mod == 0)
+        te = te->mutableOf();
+        else
+        {   assert(t->mod == MODinvariant);
+        te = te->invariantOf();
+        }
+        MATCH m2 = e->implicitConvTo(te);
+        //printf("\t%s => %s, match = %d\n", e->toChars(), te->toChars(), m2);
+        if (m2 < m)
+        m = m2;
+    }
+    }
+    return m;
-}
-
@@ -553 +601 @@
-        {   if ((t->ty == Tdelegate && (f->needThis() || f->isNested())) ||
-            (t->ty == Tpointer && !(f->needThis() || f->isNested())))
+            {
-            result = MATCHexact;
+            }
-        }
-        }
@@ -608 +658 @@
-
-Expression *Expression::castTo(Scope *sc, Type *t)
-
-
-
+
-    //printf("Expression::castTo(this=%s, t=%s)\n", toChars(), t->toChars());
-#if 0
@@ -618 +666 @@
-    if (type == t)
-    return this;
-
-
-type
-
+Expression *
+Type *
+Type *typeb
+b
-    {
-    // Do (type *) cast of (type [dim])
-    if (tb->ty == Tpointer &&
-
+b
-       )
-    {
-        //printf("Converting [dim] to *\n");
-
-
+b
-        e = new NullExp(loc);
-        else
@@ -648 +696 @@
-    }
-    }
+    else
+    {
+    e = e->copy();  // because of COW for assignment to e->type
+    }
+    assert(e != this);
-    e->type = t;
-    //printf("Returning: %s\n", e->toChars());
@@ -655 +708 @@
-
-Expression *RealExp::castTo(Scope *sc, Type *t)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-Expression *ComplexExp::castTo(Scope *sc, Type *t)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-Expression *NullExp::castTo(Scope *sc, Type *t)
-Expression
+NullExp
-    Type *tb;
-
-    //printf("NullExp::castTo(t = %p)\n", t);
-
-
+
+
+
+
+
+
+
-    tb = t->toBasetype();
-
-
+e->
+e->
-    {
-    // NULL implicitly converts to any pointer type or dynamic array
-type->ty == Tpointer && 
+e->type->ty == Tpointer && e->
-        (tb->ty == Tpointer || tb->ty == Tarray || tb->ty == Taarray ||
-         tb->ty == Tdelegate))
@@ -708 +776 @@
-    else
-    {
-
-
+
-    }
-    }
@@ -1006 +1073 @@
-
-Expression *TupleExp::castTo(Scope *sc, Type *t)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -1024 +1092 @@
-    if (type == t)
-    return this;
+    ArrayLiteralExp *e = this;
-    Type *typeb = type->toBasetype();
-    Type *tb = t->toBasetype();
@@ -1036 +1105 @@
-    }
-
+    e = (ArrayLiteralExp *)copy();
+    e->elements = (Expressions *)elements->copy();
-    for (int i = 0; i < elements->dim; i++)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return this;
-
-
-
-
-
-
-
-
-
-
-
+
-    Type *typeb = type->toBasetype();
-    Type *tb = t->toBasetype();
@@ -1059 +1134 @@
-    tb->nextOf()->toBasetype()->ty != Tvoid)
-    {
+    e = (AssocArrayLiteralExp *)copy();
+    e->keys = (Expressions *)keys->copy();
+    e->values = (Expressions *)values->copy();
-    assert(keys->dim == values->dim);
-    for (size_t i = 0; i < keys->dim; i++)
-
- = e
-values->data[i] = (void *)e
-
-
- = e
-keys->data[i] = (void *)e
-
-
-this
+x
+x = ex
+e->values->data[i] = (void *)ex
+
+x
+x = ex
+e->keys->data[i] = (void *)ex
+
+e->
+e
-    }
-L1:
-
+e->
-}
-
-Expression *SymOffExp::castTo(Scope *sc, Type *t)
-{
-    Type *tb;
-
-#if 0
-    printf("SymOffExp::castTo(this=%s, type=%s, t=%s)\n",
-    toChars(), type->toChars(), t->toChars());
-#endif
-
-
-
-
-
+
+
+
+
+
+
-    {
-    // Look for pointers to functions where the functions are overloaded.
@@ -1094 +1171 @@
-
-    if (hasOverloads &&
-->ty == Tpointer && type
+b->ty == Tpointer && typeb
-        (tb->ty == Tpointer || tb->ty == Tdelegate) && tb->nextOf()->ty == Tfunction)
-    {
@@ -1125 +1202 @@
-    e = Expression::castTo(sc, t);
-    }
-
-
+
+
+
-    ((SymOffExp *)e)->hasOverloads = 0;
-    }
-    e->type = t;
-    return e;
-}
@@ -1135 +1212 @@
-Expression *DelegateExp::castTo(Scope *sc, Type *t)
-{
-    Type *tb;
-#if 0
-    printf("DelegateExp::castTo(this=%s, type=%s, t=%s)\n",
-    toChars(), type->toChars(), t->toChars());
-#endif
+    static char msg[] = "cannot form delegate due to covariant return type";
+
-    Expression *e = this;
-
-
-
-
-
+
+
+
-    {
-    // Look for delegates to functions where the functions are overloaded.
-    FuncDeclaration *f;
-
-->ty == Tdelegate && type
+b->ty == Tdelegate && typeb
-        tb->ty == Tdelegate && tb->nextOf()->ty == Tfunction)
-    {
@@ -1177 +1253 @@
-    if (func->tintro && func->tintro->nextOf()->isBaseOf(func->type->nextOf(), &offset) && offset)
-        error("%s", msg);
-
-
+
+
+
-    return e;
-}
@@ -1262 +1339 @@
-    t2 = e2->type;
-    assert(t1);
+    t = t1;
-
-    //if (t1) printf("\tt1 = %s\n", t1->toChars());
@@ -1317 +1395 @@
-    return this;
-    }
+
+    t1 = t1b;
+    t2 = t2b;
-
-    if (op == TOKcat)
@@ -1338 +1419 @@
-        else
-        e2 = e2->castTo(sc, t2);
+        t = t1;
-        goto Lagain;
-    }
@@ -1343 +1425 @@
-
-Lagain:
-    t = t1;
-    if (t1 == t2)
-    {
@@ -1366 +1447 @@
-        t1 = t1n->mutableOf()->constOf()->pointerTo();
-        t2 = t2n->mutableOf()->constOf()->pointerTo();
+        t = t1;
-        goto Lagain;
-    }
@@ -1429 +1511 @@
-    else
-        t2 = t2->nextOf()->mutableOf()->constOf()->arrayOf();
+    t = t1;
-    goto Lagain;
-    }
@@ -1467 +1550 @@
-    goto Lt2;
-    }
-//else if (e2->op == TOKstring) { printf("test2\n"); }
-    else if ((e2->op == TOKstring || e2->op == TOKnull) && e2->implicitConvTo(t1))
-    {
@@ -1527 +1609 @@
-
-Expression *Expression::integralPromotions(Scope *sc)
-
-
-
+
+
+
+
-    switch (type->toBasetype()->ty)
-    {

trunk/rebuild/class.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -653 +653 @@
-    Module::dprogress++;
-
+    dtor = buildDtor(sc);
-
-    sc->pop();

trunk/rebuild/constfold.c

@@ -901 +901 @@
-    real_t r2;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    r1 = e1->toReal();

trunk/rebuild/declaration.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -87 +87 @@
- */
-
-
+, Type *t
-{
-    /* if (sc->incontract && isParameter())
-    error(loc, "cannot modify parameter '%s' in contract", toChars()); */
-
-    VarDeclaration *v = isVarDeclaration();
-    /* if (v && v->canassign == 0 &&
-        (isConst() || isInvariant()) && !isCtorinit())
-    error(loc, "cannot modify const/invariant variable '%s'", toChars()); */
-
-    if (isCtorinit())
@@ -111 +106 @@
-           )
-        {
+        VarDeclaration *v = isVarDeclaration();
-        assert(v);
-        v->ctorinit = 1;
@@ -131 +127 @@
-    }
-    }
+    else
+    {
+    VarDeclaration *v = isVarDeclaration();
+    if (v && v->canassign == 0)
+    {
+        char *p = NULL;
+        if (isConst())
+        p = "const";
+        else if (isInvariant())
+        p = "invariant";
+        else if (storage_class & STCmanifest)
+        p = "manifest constant";
+        else if (!t->isAssignable())
+        p = "struct with immutable members";
+        if (p)
+        {   error(loc, "cannot modify %s", p);
+        halt();
+        }
+    }
+    }
-}
-
@@ -372 +388 @@
-Dsymbol *AliasDeclaration::syntaxCopy(Dsymbol *s)
-{
+    //printf("AliasDeclaration::syntaxCopy()\n");
-    assert(!s);
-    AliasDeclaration *sa;
@@ -645 +662 @@
-    //printf(" type = %s\n", type ? type->toChars() : "null");
-    //printf(" stc = x%x\n", sc->stc);
+    //printf(" storage_class = x%x\n", storage_class);
-    //printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
@@ -672 +690 @@
-    type = type->semantic(loc, sc);
-    }
-
+semantic 
-
-    type->checkDeprecated(loc, sc);
@@ -713 +731 @@
-    Objects *exps = new Objects();
-    exps->setDim(nelems);
+    Expression *ie = init ? init->toExpression() : NULL;
-
-    for (size_t i = 0; i < nelems; i++)
@@ -723 +742 @@
-        Identifier *id = new Identifier(name, TOKidentifier);
-
-
+
+
+
+
+
+
+
+
+
+
-        //printf("declaring field %s of type %s\n", v->toChars(), v->type->toChars());
-        v->semantic(sc);
@@ -752 +780 @@
-        type = type->constOf();
-    }
-
-
-
-
-
+
+
+
+
+
+
-    {
-    //error("variable %s cannot be synchronized", toChars());
@@ -768 +797 @@
-    //error("abstract cannot be applied to variable");
-    }
-
+
+
+
+
+
+
-    {
-    }
@@ -819 +853 @@
-    if (type->isauto() && !noauto)
-    {
-
-
-
+ | STCmanifest
+
+manifest constants, 
-    } */
-
@@ -838 +872 @@
-    if (init)
-    storage_class |= STCinit;     // remember we had an explicit initializer
-
+
+
+
+
-    if (!init && !sc->inunion && !isStatic() && fd &&
-    (!(storage_class & (STCfield | STCin | STCforeach | STCparameter)) || (storage_class & STCout)) &&
@@ -877 +914 @@
-        init = getExpInitializer();
-    }
+    // Default initializer is always a blit
+    op = TOKblit;
-    }
-
@@ -906 +945 @@
-        // If local variable, use AssignExp to handle all the various
-        // possibilities.
-
+ !(storage_class & STCmanifest) &&
-        !init->isVoidInitializer())
-        {
@@ -958 +997 @@
-        }
-        ei->exp = new AssignExp(loc, e1, ei->exp);
-TOKconstruct
+op
-        canassign++;
-        ei->exp = ei->exp->semantic(sc);
@@ -969 +1008 @@
-        }
-    }
-
+ | STCmanifest
-         type->isConst() || type->isInvariant())
-    {
@@ -1069 +1108 @@
-void VarDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
+    if (storage_class & STCmanifest)
+    buf->writestring("manifest ");
-    if (storage_class & STCstatic)
-    buf->writestring("static ");
@@ -1082 +1123 @@
-    if (init)
-    {   buf->writestring(" = ");
-
+
+
+
+
+
-    }
-    buf->writeByte(';');
@@ -1115 +1160 @@
-void VarDeclaration::checkNestedReference(Scope *sc, Loc loc)
-{
-
+
+
-    {
-    // The function that this variable is in
@@ -1141 +1187 @@
-            goto L2;
-        }
+
-        fdv->closureVars.push(this);
-      L2: ;
@@ -1177 +1224 @@
-Expression *VarDeclaration::getConstInitializer()
-{
-
+ || storage_class & STCmanifest
-    storage_class & STCinit)
-    {
@@ -1194 +1241 @@
-int VarDeclaration::canTakeAddressOf()
-{
+#if 0
-    /* Global variables and struct/class fields of the form:
-     *  const int x = 3;
@@ -1207 +1255 @@
-    return 0;
-    }
+#else
+    if (storage_class & STCmanifest)
+    return 0;
+#endif
-    return 1;
-}
@@ -1222 +1274 @@
-    printf("parent = '%s'\n", parent->toChars());
-#endif
+    if (storage_class & STCmanifest)
+    return 0;
-    Dsymbol *parent = this->toParent();
-    if (!parent && !(storage_class & STCstatic))
@@ -1236 +1290 @@
-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());
+
+    if (noauto || storage_class & STCnodtor)
+    return FALSE;
+
+  &n