Changeset 783

Timestamp:

08/26/07 19:13:24 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 2.003

Files:

• branches/dmdfe-2.0/Makefile (modified) (1 diff)
• branches/dmdfe-2.0/cast.c (modified) (46 diffs)
• branches/dmdfe-2.0/class.c (modified) (2 diffs)
• branches/dmdfe-2.0/constfold.c (modified) (7 diffs)
• branches/dmdfe-2.0/declaration.c (modified) (10 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (5 diffs)
• branches/dmdfe-2.0/doc.c (modified) (2 diffs)
• branches/dmdfe-2.0/dsymbol.c (modified) (3 diffs)
• branches/dmdfe-2.0/expression.c (modified) (84 diffs)
• branches/dmdfe-2.0/expression.h (modified) (8 diffs)
• branches/dmdfe-2.0/func.c (modified) (15 diffs)
• branches/dmdfe-2.0/idgen.c (modified) (1 diff)
• branches/dmdfe-2.0/impcnvgen.c (modified) (6 diffs)
• branches/dmdfe-2.0/init.c (modified) (5 diffs)
• branches/dmdfe-2.0/lexer.c (modified) (1 diff)
• branches/dmdfe-2.0/lexer.h (modified) (1 diff)
• branches/dmdfe-2.0/link.c (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (6 diffs)
• branches/dmdfe-2.0/mars.h (modified) (1 diff)
• branches/dmdfe-2.0/mtype.c (modified) (119 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (35 diffs)
• branches/dmdfe-2.0/optimize.c (modified) (7 diffs)
• branches/dmdfe-2.0/parse.c (modified) (54 diffs)
• branches/dmdfe-2.0/parse.h (modified) (2 diffs)
• branches/dmdfe-2.0/statement.c (modified) (18 diffs)
• branches/dmdfe-2.0/statement.h (modified) (2 diffs)
• branches/dmdfe-2.0/template.c (modified) (9 diffs)
• branches/dmdfe-2.0/todt.c (modified) (8 diffs)
• branches/dmdfe-2.0/toobj.c (modified) (2 diffs)
• branches/dmdfe-2.0/typinf.c (modified) (8 diffs)

branches/dmdfe-2.0/Makefile

@@ -56 +56 @@
-  struct.o \
-  template.o \
+  traits.o \
-  unialpha.o \
-  utf.o \

branches/dmdfe-2.0/cast.c

@@ -1 +1 @@
-
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -32 +32 @@
-Expression *Expression::implicitCastTo(Scope *sc, Type *t)
-{
-
+
+
+
-    if (implicitConvTo(t))
-    {
@@ -61 +63 @@
-t->print();
-printf("%p %p type: %s to: %s\n", type->deco, t->deco, type->deco, t->deco);
-
+Of()
-fflush(stdout);
-#endif
@@ -98 +100 @@
-    type = Type::terror;
-    }
-    if (t->ty == Tbit && isBit())
-    return MATCHconvert;
-    Expression *e = optimize(WANTvalue | WANTflags);
-    if (e != this)
@@ -106 +106 @@
-    }
-    MATCH match = type->implicitConvTo(t);
-
+ != MATCHnomatch
-    return match;
-#if 0
@@ -112 +112 @@
-    if (tb->ty == Tdelegate)
-    {   TypeDelegate *td = (TypeDelegate *)tb;
-
+Of()
-
-    if (!tf->varargs &&
@@ -118 +118 @@
-       )
-    {
-
+Of()
-        if (match)
-        return match;
-
+Of()
-        return MATCHconvert;
-    }
@@ -139 +139 @@
-    return MATCHexact;
-
-enum 
-enum 
+
+
-
-    if (type->implicitConvTo(t) == MATCHnomatch && t->ty == Tenum)
-
-
-
+
-
-    switch (ty)
@@ -301 +299 @@
-        goto Lyes;
-    }
+
+    case Tpointer:
+//printf("type = %s\n", type->toBasetype()->toChars());
+//printf("t = %s\n", t->toBasetype()->toChars());
+        if (ty == Tpointer &&
+            type->toBasetype()->nextOf()->ty == t->toBasetype()->nextOf()->ty)
+        {   /* Allow things like:
+         *  const char* P = cast(char *)3;
+         *  char* q = P;
+         */
+        goto Lyes;
+        }
+        break;
-    }
-    return Expression::implicitConvTo(t);
-
-Lyes:
-    //printf("MATCHconvert\n");
-    return MATCHconvert;
-
-Lno:
-    //printf("MATCHnomatch\n");
-    return MATCHnomatch;
-}
@@ -322 +331 @@
-    return MATCHexact;
-    // NULL implicitly converts to any pointer type or dynamic array
-
+Of()
-    {
-    if (t->ty == Ttypedef)
@@ -343 +352 @@
-    if (!committed)
-    {
-
+Of()
-    {
-    return MATCHnomatch;
@@ -349 +358 @@
-    if (type->ty == Tsarray || type->ty == Tarray || type->ty == Tpointer)
-    {
-
-
+
+
+
+
+
-        switch (t->ty)
-        {
-        case Tsarray:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        case Tarray:
-            goto L1;
-        case Tpointer:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            break;
-        }
@@ -389 +411 @@
-{   MATCH result = MATCHexact;
-
+#if 0
+    printf("ArrayLiteralExp::implicitConvTo(this=%s, type=%s, t=%s)\n",
+    toChars(), type->toChars(), t->toChars());
+#endif
-    Type *typeb = type->toBasetype();
-    Type *tb = t->toBasetype();
@@ -402 +428 @@
-    for (int i = 0; i < elements->dim; i++)
-    {   Expression *e = (Expression *)elements->data[i];
-
+Of()
-        if (m < result)
-        result = m;         // remember worst match
@@ -423 +449 @@
-    for (size_t i = 0; i < keys->dim; i++)
-    {   Expression *e = (Expression *)keys->data[i];
-key
+index
-        if (m < result)
-        result = m;         // remember worst match
@@ -429 +455 @@
-        break;              // no need to check for worse
-        e = (Expression *)values->data[i];
-
+Of()
-        if (m < result)
-        result = m;         // remember worst match
@@ -459 +485 @@
-
-    t = t->toBasetype();
-
-
+Of()
+Of()
-        e1->op == TOKvar)
-    {
+        /* I don't think this can ever happen -
+         * it should have been
+         * converted to a SymOffExp.
+         */
+        assert(0);
-        ve = (VarExp *)e1;
-        f = ve->var->isFuncDeclaration();
-
+Of()
-        result = MATCHexact;
-    }
@@ -490 +521 @@
-
-    t = t->toBasetype();
-
-t->ty == Tpointer && t->next
+Of()
+(t->ty == Tpointer || t->ty == Tdelegate) && t->nextOf()
-    {
-        f = var->isFuncDeclaration();
-
-
+
+
+
+
+
+
+
+
-    }
-    }
@@ -512 +549 @@
-    result = type->implicitConvTo(t);
-
-0
+MATCHnomatch
-    {
-    // Look for pointers to functions where the functions are overloaded.
@@ -518 +555 @@
-
-    t = t->toBasetype();
-
-
-
-
+Of()
+Of()
+
+Of()
-        result = MATCHexact;
-    }
@@ -561 +598 @@
-    if (tb != type)
-    {
-    if (tb->ty == Tbit && isBit())
-        ;
-
-    // Do (type *) cast of (type [dim])
-else 
+
-        type->ty == Tsarray
-       )
@@ -580 +614 @@
-    {
-        TypeDelegate *td = (TypeDelegate *)tb;
-
-
+Of()
+Of()
-    }
-#endif
@@ -629 +663 @@
-    {
-    // NULL implicitly converts to any pointer type or dynamic array
-
+Of()
-        (tb->ty == Tpointer || tb->ty == Tarray || tb->ty == Taarray ||
-         tb->ty == Tdelegate))
@@ -636 +670 @@
-        if (tb->ty == Tdelegate)
-        {   TypeDelegate *td = (TypeDelegate *)tb;
-
+Of()
-
-        if (!tf->varargs &&
@@ -665 +699 @@
-    //printf("StringExp::castTo(t = %s), '%s' committed = %d\n", t->toChars(), toChars(), committed);
-
-
+Of()
-    {
-    error("cannot convert string literal to void*");
@@ -708 +742 @@
-    if (se->committed == 1)
-    {
-->size() == tb->next
+Of()->size() == tb->nextOf()
-    {   se->type = t;
-        return se;
@@ -728 +762 @@
-    OutBuffer buffer;
-    newlen = 0;
-
-
+Of()
+Of()
-    switch (X(tfty, ttty))
-    {
@@ -820 +854 @@
-        se->string = buffer.extractData();
-        se->len = newlen;
-
+Of()
-        break;
-
-    default:
-->size() == tb->next
+Of()->size() == tb->nextOf()
-        {   se->type = t;
-        return se;
@@ -894 +928 @@
-    FuncDeclaration *f;
-
-
-
+Of()
+Of()
-        e1->op == TOKvar)
-    {
@@ -902 +936 @@
-        if (f)
-        {
-
+Of()
-        if (f)
-        {
@@ -937 +971 @@
-    if ((tb->ty == Tarray || tb->ty == Tsarray) &&
-    (typeb->ty == Tarray || typeb->ty == Tsarray) &&
-
+Of()
-    {
-    if (tb->ty == Tsarray)
@@ -947 +981 @@
-    for (int i = 0; i < elements->dim; i++)
-    {   Expression *e = (Expression *)elements->data[i];
-
+Of()
-        elements->data[i] = (void *)e;
-    }
@@ -955 +989 @@
-    if (tb->ty == Tpointer && typeb->ty == Tsarray)
-    {
-
+Of()
-    }
-L1:
@@ -966 +1000 @@
-    Type *tb = t->toBasetype();
-    if (tb->ty == Taarray && typeb->ty == Taarray &&
-
+Of()
-    {
-    assert(keys->dim == values->dim);
-    for (size_t i = 0; i < keys->dim; i++)
-    {   Expression *e = (Expression *)values->data[i];
-
+Of()
-        values->data[i] = (void *)e;
-
-        e = (Expression *)keys->data[i];
-key
+index
-        keys->data[i] = (void *)e;
-    }
@@ -1002 +1036 @@
-    FuncDeclaration *f;
-
-
-
+
+
+
-    {
-        f = var->isFuncDeclaration();
-        if (f)
-        {
-
+Of()
-        if (f)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return e;
-        }
@@ -1018 +1066 @@
-    }
-    e = Expression::castTo(sc, t);
+    }
+    if (e == this && hasOverloads)
+    {   e = syntaxCopy();
+    ((SymOffExp *)e)->hasOverloads = 0;
-    }
-    e->type = t;
@@ -1040 +1092 @@
-    FuncDeclaration *f;
-
-
-
+Of()
+Of()
-    {
-        if (func)
-        {
-
+Of()
-        if (f)
-        {   int offset;
-->isBaseOf(f->type->next
+Of()->isBaseOf(f->type->nextOf()
-            error("%s", msg);
-            e = new DelegateExp(loc, e1, f);
@@ -1063 +1115 @@
-    {   int offset;
-
-->isBaseOf(func->type->next
+Of()->isBaseOf(func->type->nextOf()
-        error("%s", msg);
-    }
@@ -1102 +1154 @@
-    Type *t = Type::tptrdiff_t;
-
-
+Of()
-    if (!t->equals(t2b))
-        e2 = e2->castTo(sc, t);
-
-
-
-
-
-
-
+
-    e2->type = t;
-    type = e1->type;
@@ -1121 +1167 @@
-    Expression *e;
-
-
+Of()
-    if (!t->equals(t1b))
-        e = e1->castTo(sc, t);
-    else
-        e = e1;
-
-
-
-
-
+
-    e->type = t;
-    type = e2->type;
@@ -1216 +1258 @@
-    }
-
+    if (op == TOKcat)
+    {
+    if ((t1->ty == Tsarray || t1->ty == Tarray) &&
+        (t2->ty == Tsarray || t2->ty == Tarray) &&
+        (t1->nextOf()->mod || t2->nextOf()->mod))
+    {
+        t1 = t1->constOf();
+        t2 = t2->constOf();
+    }
+    }
+
+Lagain:
-    t = t1;
-    if (t1 == t2)
@@ -1223 +1277 @@
-        goto Lincompatible;
-    }
-    else if (t1->isintegral() && t2->isintegral())
-    {
-    printf("t1 = %s, t2 = %s\n", t1->toChars(), t2->toChars());
-    int sz1 = t1->size();
-    int sz2 = t2->size();
-    int sign1 = t1->isunsigned() == 0;
-    int sign2 = t2->isunsigned() == 0;
-
-    if (sign1 == sign2)
-    {
-        if (sz1 < sz2)
-        goto Lt2;
-        else
-        goto Lt1;
-    }
-    if (!sign1)
-    {
-        if (sz1 >= sz2)
-        goto Lt1;
-        else
-        goto Lt2;
-    }
-    else
-    {
-        if (sz2 >= sz1)
-        goto Lt2;
-        else
-        goto Lt1;
-    }
-    }
-    else if (t1->ty == Tpointer && t2->ty == Tpointer)
-    {
-    // Bring pointers to compatible type
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        t = t2;
-    else if (t2n->ty == Tvoid)
-        ;
+    else if (t1n->mod != t2n->mod)
+    {
+        t1 = t1->constOf();
+        t2 = t2->constOf();
+        goto Lagain;
+    }
-    else if (t1n->ty == Tclass && t2n->ty == Tclass)
-    {   ClassDeclaration *cd1 = t1n->isClassHandle();
@@ -1290 +1318 @@
-    }
-    else if ((t1->ty == Tsarray || t1->ty == Tarray) &&
-
-
+
+
+
+
-    goto Lx1;
-    }
-    else if ((t2->ty == Tsarray || t2->ty == Tarray) &&
-
-
+
+
+
+
-    goto Lx2;
-    }
@@ -1306 +1338 @@
-    {
-    goto Lt1;
+    }
+    /* If one is mutable and the other invariant, then retry
+     * with both of them as const
+     */
+    else if ((t1->ty == Tsarray || t1->ty == Tarray || t1->ty == Tpointer) &&
+         (t2->ty == Tsarray || t2->ty == Tarray || t2->ty == Tpointer) &&
+         t1->nextOf()->mod != t2->nextOf()->mod
+        )
+    {
+    t1 = t1->constOf();
+    t2 = t2->constOf();
+    goto Lagain;
-    }
-    else if (t1->ty == Tclass || t2->ty == Tclass)
@@ -1334 +1378 @@
-        goto Lincompatible;
-    }
+    else if (t1->ty == Tstruct && t2->ty == Tstruct)
+    {
+    if (((TypeStruct *)t1)->sym != ((TypeStruct *)t2)->sym)
+        goto Lincompatible;
+    }
-    else if ((e1->op == TOKstring || e1->op == TOKnull) && e1->implicitConvTo(t2))
-    {
@@ -1344 +1393 @@
-    }
-    else if (t1->ty == Tsarray && t2->ty == Tsarray &&
-
+Of()
-    {
-     Lx1:
-
+Of()
-    e1 = e1->castTo(sc, t);
-    e2 = e2->castTo(sc, t);
-    }
-    else if (t1->ty == Tsarray && t2->ty == Tsarray &&
-
+Of()
-    {
-     Lx2:
-
+Of()
-    e1 = e1->castTo(sc, t);
-    e2 = e2->castTo(sc, t);
+    }
+    else if (t1->isintegral() && t2->isintegral())
+    {
+    assert(0);
-    }
-    else

branches/dmdfe-2.0/class.c

@@ -146 +146 @@
-            Type::typeinfotypelist->error("%s", msg);
-        Type::typeinfotypelist = this;
+        }
+
+        if (id == Id::TypeInfo_Const)
+        {   if (Type::typeinfoconst)
+            Type::typeinfoconst->error("%s", msg);
+        Type::typeinfoconst = this;
+        }
+
+        if (id == Id::TypeInfo_Invariant)
+        {   if (Type::typeinfoinvariant)
+            Type::typeinfoinvariant->error("%s", msg);
+        Type::typeinfoinvariant = this;
-        }
-    }
@@ -568 +580 @@
-    members->push(ctor);
-    ctor->addMember(sc, this, 1);
-
+  // why? What about sc->nofree?
-    sc->offset = structsize;
-    ctor->semantic(sc);

branches/dmdfe-2.0/constfold.c

@@ -972 +972 @@
-
-    //printf("Cast(type = %s, to = %s, e1 = %s)\n", type->toChars(), to->toChars(), e1->toChars());
-
-type->equals(e1->type) && to->equals(type
+\t
+e1->type->equals(type) && type->equals(to
-    return e1;
+    if (e1->type->implicitConvTo(to) >= MATCHconst ||
+    to->implicitConvTo(e1->type) >= MATCHconst)
+    return expType(to, e1);
-
-    if (e1->isConst() != 1)
@@ -1243 +1246 @@
-    Loc loc = e1->loc;
-    Type *t;
+    Type *t1 = e1->type->toBasetype();
+    Type *t2 = e2->type->toBasetype();
-
-    //printf("Cat(e1 = %s, e2 = %s)\n", e1->toChars(), e2->toChars());
+    //printf("\tt1 = %s, t2 = %s\n", t1->toChars(), t2->toChars());
-
-    if (e1->op == TOKnull && e2->op == TOKint64)
@@ -1363 +1369 @@
-    }
-    else if (e1->op == TOKarrayliteral && e2->op == TOKarrayliteral &&
-e1->type->equals(e2->type
+t1->nextOf()->equals(t2->nextOf()
-    {
-    // Concatenate the arrays
@@ -1375 +1381 @@
-    if (type->toBasetype()->ty == Tsarray)
-    {
-e1->type->toBasetype()->next
+t1->nextOf()
-        e->type = e->type->semantic(loc, NULL);
-    }
@@ -1382 +1388 @@
-    }
-    else if (e1->op == TOKarrayliteral &&
-
+Of()
-    {
-    ArrayLiteralExp *es1 = (ArrayLiteralExp *)e1;
@@ -1399 +1405 @@
-    }
-    else if (e2->op == TOKarrayliteral &&
-
+Of()
-    {
-    ArrayLiteralExp *es2 = (ArrayLiteralExp *)e2;
@@ -1426 +1432 @@
-      L1:
-    Type *tb = t->toBasetype();
-
+Of()
-    {   Expressions *expressions = new Expressions();
-        expressions->push(e);

branches/dmdfe-2.0/declaration.c

@@ -81 +81 @@
-}
-
+/*************************************
+ * Check to see if declaration can be modified in this context (sc).
+ * Issue error if not.
+ */
+
+void Declaration::checkModify(Loc loc, Scope *sc)
+{
+    if (sc->incontract && isParameter())
+    error(loc, "cannot modify parameter '%s' in contract", toChars());
+
+    VarDeclaration *v = isVarDeclaration();
+    if (v && v->canassign == 0 &&
+        (isConst() || isInvariant() || (isFinal() && !isCtorinit())))
+    error(loc, "cannot modify final/const/invariant variable '%s'", toChars());
+
+    if (isCtorinit())
+    {   // It's only modifiable if inside the right constructor
+    Dsymbol *s = sc->func;
+    while (1)
+    {
+        FuncDeclaration *fd = NULL;
+        if (s)
+        fd = s->isFuncDeclaration();
+        if (fd &&
+        ((fd->isCtorDeclaration() && storage_class & STCfield) ||
+         (fd->isStaticCtorDeclaration() && !(storage_class & STCfield))) &&
+        fd->toParent() == toParent()
+           )
+        {
+        assert(v);
+        v->ctorinit = 1;
+        //printf("setting ctorinit\n");
+        }
+        else
+        {
+        if (s)
+        {   s = s->toParent2();
+            continue;
+        }
+        else
+        {
+            const char *p = isStatic() ? "static " : "";
+            error(loc, "can only initialize %sconst %s inside %sconstructor",
+            p, toChars(), p);
+        }
+        }
+        break;
+    }
+    }
+}
+
+
-/********************************* TupleDeclaration ****************************/
-
@@ -140 +192 @@
-        Argument *arg = new Argument(STCin, t, id, NULL);
-#else
-STCin
+0
-#endif
-        args->data[i] = (void *)arg;
@@ -628 +680 @@
-    protection = sc->protection;
-    //printf("sc->stc = %x\n", sc->stc);
-
+x
-
-    Dsymbol *parent = toParent();
@@ -690 +742 @@
-    }
-
-
-
-
+
+
+
+
-
-    if (isConst())
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    }
@@ -721 +789 @@
-        aad = parent->isAggregateDeclaration();
-    if (aad)
-
+   assert(!(storage_class & (STCconst | STCinvariant | STCstatic)));
-        aad->addField(sc, this);
-    }
@@ -826 +894 @@
-        // If local variable, use AssignExp to handle all the various
-        // possibilities.
-
+
+
-        {
-        Expression *e1;
@@ -858 +927 @@
-            while (1)
-            {
-
+Of()
-            if (t->ty != Tsarray)
-                break;
-
-
-
-
-
-
+
+
-            }
-            e1 = new SliceExp(loc, e1, NULL, NULL);
@@ -886 +951 @@
-        {
-        init = init->semantic(sc, type);
-isConst(
+(isConst() || isInvariant()
-        {   // Make it static
-            storage_class |= STCstatic;
@@ -892 +957 @@
-        }
-    }
-
+Invariant() || is
-    {
-        /* Because we may need the results of a const declaration in a
@@ -1159 +1224 @@
-}
-
+/***************************** TypeInfoConstDeclaration **********************/
+
+TypeInfoConstDeclaration::TypeInfoConstDeclaration(Type *tinfo)
+    : TypeInfoDeclaration(tinfo, 0)
+{
+}
+
+/***************************** TypeInfoInvariantDeclaration **********************/
+
+TypeInfoInvariantDeclaration::TypeInfoInvariantDeclaration(Type *tinfo)
+    : TypeInfoDeclaration(tinfo, 0)
+{
+}
+
-/***************************** TypeInfoStructDeclaration **********************/
-