Changeset 902

Timestamp:

06/29/08 18:49:05 (3 months ago)

Author:

Gregor

Message:

MERGE: DMD 2.015

Files:

• branches/dmdfe-2.0/attrib.c (modified) (15 diffs)
• branches/dmdfe-2.0/attrib.h (modified) (1 diff)
• branches/dmdfe-2.0/cast.c (modified) (5 diffs)
• branches/dmdfe-2.0/class.c (modified) (1 diff)
• branches/dmdfe-2.0/constfold.c (modified) (3 diffs)
• branches/dmdfe-2.0/declaration.c (modified) (4 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (5 diffs)
• branches/dmdfe-2.0/doc.c (modified) (3 diffs)
• branches/dmdfe-2.0/dsymbol.c (modified) (1 diff)
• branches/dmdfe-2.0/dsymbol.h (modified) (2 diffs)
• branches/dmdfe-2.0/expression.c (modified) (32 diffs)
• branches/dmdfe-2.0/expression.h (modified) (15 diffs)
• branches/dmdfe-2.0/func.c (modified) (11 diffs)
• branches/dmdfe-2.0/interpret.c (modified) (1 diff)
• branches/dmdfe-2.0/lexer.c (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (3 diffs)
• branches/dmdfe-2.0/mtype.c (modified) (10 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (1 diff)
• branches/dmdfe-2.0/opover.c (modified) (6 diffs)
• branches/dmdfe-2.0/parse.c (modified) (61 diffs)
• branches/dmdfe-2.0/parse.h (modified) (3 diffs)
• branches/dmdfe-2.0/statement.c (modified) (16 diffs)
• branches/dmdfe-2.0/statement.h (modified) (1 diff)
• branches/dmdfe-2.0/template.c (modified) (47 diffs)
• branches/dmdfe-2.0/template.h (modified) (5 diffs)
• branches/dmdfe-2.0/toir.c (modified) (5 diffs)
• branches/dmdfe-2.0/toobj.c (modified) (18 diffs)

branches/dmdfe-2.0/attrib.c

@@ -51 +51 @@
-int AttribDeclaration::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
-{
-    unsigned i;
-    int m = 0;
-    Array *d = include(sc, sd);
@@ -57 +56 @@
-    if (d)
-    {
-
-
-
-
+
+
-        m |= s->addMember(sc, sd, m | memnum);
-    }
@@ -71 +68 @@
-    Array *d = include(sc, NULL);
-
-\n",toChars()
+, d = %p\n",toChars(), d
-    if (d)
-    {
@@ -85 +82 @@
-void AttribDeclaration::semantic2(Scope *sc)
-{
-    unsigned i;
-    Array *d = include(sc, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        s->semantic2(sc);
-    }
@@ -101 +95 @@
-void AttribDeclaration::semantic3(Scope *sc)
-{
-    unsigned i;
-    Array *d = include(sc, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        s->semantic3(sc);
-    }
@@ -117 +108 @@
-void AttribDeclaration::inlineScan()
-{
-    unsigned i;
-    Array *d = include(NULL, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        //printf("AttribDeclaration::inlineScan %s\n", s->toChars());
-        s->inlineScan();
@@ -136 +124 @@
-    if (comment)
-    {
-    unsigned i;
-    Array *d = include(NULL, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        //printf("AttribDeclaration::addComment %s\n", s->toChars());
-        s->addComment(comment);
@@ -162 +147 @@
-//  return;
-
-    unsigned i;
-    Array *d = include(NULL, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        //printf("AttribDeclaration::emitComment %s\n", s->toChars());
-        s->emitComment(sc);
@@ -207 +189 @@
-void AttribDeclaration::checkCtorConstInit()
-{
-    unsigned i;
-    Array *d = include(NULL, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        s->checkCtorConstInit();
-    }
@@ -225 +204 @@
-
-void AttribDeclaration::addLocalClass(ClassDeclarations *aclasses)
-   unsigned i;
+
-    Array *d = include(NULL, NULL);
-
-    if (d)
-    {
-
-
-
-
+
+
-        s->addLocalClass(aclasses);
-    }
@@ -1042 +1019 @@
-int StaticIfDeclaration::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
-{
+    //printf("StaticIfDeclaration::addMember() '%s'\n",toChars());
-    /* This is deferred until semantic(), so that
-     * expressions in the condition can refer to declarations
@@ -1068 +1046 @@
-    Array *d = include(sc, sd);
-
-\n",toChars()
+, d = %p\n",toChars(), d
-    if (d)
-    {
@@ -1098 +1076 @@
-    this->exp = exp;
-    this->sd = NULL;
+    this->compiled = 0;
-}
-
@@ -1109 +1088 @@
-int CompileDeclaration::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
-{
+    //printf("CompileDeclaration::addMember(sc = %p)\n", sc);
-    this->sd = sd;
+    if (memnum == 0)
+    {   /* No members yet, so parse the mixin now
+     */
+    compileIt(sc);
+    memnum |= AttribDeclaration::addMember(sc, sd, memnum);
+    compiled = 1;
+    }
-    return memnum;
-}
-
-semantic
-
-semantic
+compileIt
+
+compileIt
-    exp = exp->semantic(sc);
-    exp = resolveProperties(sc, exp);
@@ -1121 +1108 @@
-    if (exp->op != TOKstring)
-    {   error("argument to mixin must be a string, not (%s)", exp->toChars());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    AttribDeclaration::semantic(sc);
-}

branches/dmdfe-2.0/attrib.h

@@ -152 +152 @@
-
-    ScopeDsymbol *sd;
+    int compiled;
-
-    CompileDeclaration(Loc loc, Expression *exp);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    int addMember(Scope *sc, ScopeDsymbol *sd, int memnum);
+    void compileIt(Scope *sc);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);

branches/dmdfe-2.0/cast.c

@@ -1318 +1318 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
- */
-
-
-
-
-
-
-
-
-
+
+
+
-    //dump(0);
-
-
-
-
-
-
-
+
+
+
+
+
-    assert(t1);
-
+Type *
-
-    //if (t1) printf("\tt1 = %s\n", t1->toChars());
@@ -1351 +1352 @@
-    Type *t2b = t2->toBasetype();
-
-
+TY 
-    if (ty != Terror)
-    {   TY ty1;
@@ -1363 +1364 @@
-        if (t1 == t2)
-        {
-
-
-
+
+
-        }
-
-        if (t1b == t2b)
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    t1 = Type::basic[ty1];
@@ -1383 +1381 @@
-    e1 = e1->castTo(sc, t1);
-    e2 = e2->castTo(sc, t2);
-#if 0
-    if (type != Type::basic[ty])
-    {   t = type;
-        type = Type::basic[ty];
-        return castTo(sc, t);
-    }
-#endif
-    //printf("after typeCombine():\n");
-    //dump(0);
-    //printf("ty = %d, ty1 = %d, ty2 = %d\n", ty, ty1, ty2);
-return this
+goto Lret
-    }
-
-    t1 = t1b;
-    t2 = t2b;
+
+Lagain:
+    if (t1 == t2)
+    {
+    }
+    else if (t1->ty == Tpointer && t2->ty == Tpointer)
+    {
+    // Bring pointers to compatible type
+    Type *t1n = t1->nextOf();
+    Type *t2n = t2->nextOf();
+
+    if (t1n == t2n)
+        ;
+    else if (t1n->ty == Tvoid)  // pointers to void are always compatible
+        t = t2;
+    else if (t2n->ty == Tvoid)
+        ;
+    else if (t1n->mod != t2n->mod)
+    {
+        t1 = t1n->mutableOf()->constOf()->pointerTo();
+        t2 = t2n->mutableOf()->constOf()->pointerTo();
+        t = t1;
+        goto Lagain;
+    }
+    else if (t1n->ty == Tclass && t2n->ty == Tclass)
+    {   ClassDeclaration *cd1 = t1n->isClassHandle();
+        ClassDeclaration *cd2 = t2n->isClassHandle();
+        int offset;
+
+        if (cd1->isBaseOf(cd2, &offset))
+        {
+        if (offset)
+            e2 = e2->castTo(sc, t);
+        }
+        else if (cd2->isBaseOf(cd1, &offset))
+        {
+        t = t2;
+        if (offset)
+            e1 = e1->castTo(sc, t);
+        }
+        else
+        goto Lincompatible;
+    }
+    else
+        goto Lincompatible;
+    }
+    else if ((t1->ty == Tsarray || t1->ty == Tarray) &&
+         e2->op == TOKnull && t2->ty == Tpointer && t2->nextOf()->ty == Tvoid)
+    {   /*  (T[n] op void*)
+     *  (T[] op void*)
+     */
+    goto Lx1;
+    }
+    else if ((t2->ty == Tsarray || t2->ty == Tarray) &&
+         e1->op == TOKnull && t1->ty == Tpointer && t1->nextOf()->ty == Tvoid)
+    {   /*  (void* op T[n])
+     *  (void* op T[])
+     */
+    goto Lx2;
+    }
+    else if ((t1->ty == Tsarray || t1->ty == Tarray) && t1->implicitConvTo(t2))
+    {
+    goto Lt2;
+    }
+    else if ((t2->ty == Tsarray || t2->ty == Tarray) && t2->implicitConvTo(t1))
+    {
+    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
+        )
+    {
+    if (t1->ty == Tpointer)
+        t1 = t1->nextOf()->mutableOf()->constOf()->pointerTo();
+    else
+        t1 = t1->nextOf()->mutableOf()->constOf()->arrayOf();
+
+    if (t2->ty == Tpointer)
+        t2 = t2->nextOf()->mutableOf()->constOf()->pointerTo();
+    else
+        t2 = t2->nextOf()->mutableOf()->constOf()->arrayOf();
+    t = t1;
+    goto Lagain;
+    }
+    else if (t1->ty == Tclass || t2->ty == Tclass)
+    {
+    while (1)
+    {
+        int i1 = e2->implicitConvTo(t1);
+        int i2 = e1->implicitConvTo(t2);
+
+        if (i1 && i2)
+        {
+        // We have the case of class vs. void*, so pick class
+        if (t1->ty == Tpointer)
+            i1 = 0;
+        else if (t2->ty == Tpointer)
+            i2 = 0;
+        }
+
+        if (i2)
+        {
+        goto Lt2;
+        }
+        else if (i1)
+        {
+        goto Lt1;
+        }
+        else if (t1->ty == Tclass && t2->ty == Tclass)
+        {   TypeClass *tc1 = (TypeClass *)t1;
+        TypeClass *tc2 = (TypeClass *)t2;
+
+        /* Pick 'tightest' type
+         */
+        ClassDeclaration *cd1 = tc1->sym->baseClass;
+        ClassDeclaration *cd2 = tc2->sym->baseClass;
+
+        if (cd1 && cd2)
+        {   t1 = cd1->type;
+            t2 = cd2->type;
+        }
+        else if (cd1)
+            t1 = cd1->type;
+        else if (cd2)
+            t2 = cd2->type;
+        else
+            goto Lincompatible;
+        }
+        else
+        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))
+    {
+    goto Lt2;
+    }
+    else if ((e2->op == TOKstring || e2->op == TOKnull) && e2->implicitConvTo(t1))
+    {
+    goto Lt1;
+    }
+    else if (t1->ty == Tsarray && t2->ty == Tsarray &&
+         e2->implicitConvTo(t1->nextOf()->arrayOf()))
+    {
+     Lx1:
+    t = t1->nextOf()->arrayOf();
+    e1 = e1->castTo(sc, t);
+    e2 = e2->castTo(sc, t);
+    }
+    else if (t1->ty == Tsarray && t2->ty == Tsarray &&
+         e1->implicitConvTo(t2->nextOf()->arrayOf()))
+    {
+     Lx2:
+    t = t2->nextOf()->arrayOf();
+    e1 = e1->castTo(sc, t);
+    e2 = e2->castTo(sc, t);
+    }
+    else if (t1->isintegral() && t2->isintegral())
+    {
+    assert(0);
+    }
+    else
+    {
+     Lincompatible:
+    return 0;
+    }
+Lret:
+    if (!*pt)
+    *pt = t;
+    *pe1 = e1;
+    *pe2 = e2;
+#if 0
+    printf("-typeMerge() %s\n", toChars());
+    if (e1->type) printf("\tt1 = %s\n", e1->type->toChars());
+    if (e2->type) printf("\tt2 = %s\n", e2->type->toChars());
+    printf("\ttype = %s\n", type->toChars());
+#endif
+    //dump(0);
+    return 1;
+
+
+Lt1:
+    e2 = e2->castTo(sc, t1);
+    t = t1;
+    goto Lret;
+
+Lt2:
+    e1 = e1->castTo(sc, t2);
+    t = t2;
+    goto Lret;
+}
+
+/************************************
+ * Bring leaves to common type.
+ */
+
+Expression *BinExp::typeCombine(Scope *sc)
+{
+    Type *t1 = e1->type->toBasetype();
+    Type *t2 = e2->type->toBasetype();
-
-    if (op == TOKcat)
@@ -1419 +1618 @@
-        else
-        e2 = e2->castTo(sc, t2);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    return this;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-

branches/dmdfe-2.0/class.c

@@ -816 +816 @@
-int ClassDeclaration::isFuncHidden(FuncDeclaration *fd)
-{
-%s)\n"
+class = %s, fd = %s)\n", toChars()
-    Dsymbol *s = search(0, fd->ident, 4|2);
-    if (!s)

branches/dmdfe-2.0/constfold.c

@@ -1079 +1079 @@
-    return expType(to, e1);
-
+    Type *tb = to->toBasetype();
+    Type *typeb = type->toBasetype();
+
+    if (e1->op == TOKstring)
+    {
+    if (tb->ty == Tarray && typeb->ty == Tarray &&
+        tb->nextOf()->size() == typeb->nextOf()->size())
+    {
+        return expType(to, e1);
+    }
+    }
+
-    if (e1->isConst() != 1)
-    return EXP_CANT_INTERPRET;
-
-    Type *tb = to->toBasetype();
-    if (tb->ty == Tbool)
-    e = new IntegerExp(loc, e1->toInteger() != 0, type);
@@ -1091 +1102 @@
-        real_t r = e1->toReal();
-
-->toBasetype()
+b
-        {
-        case Tint8: result = (d_int8)r; break;
@@ -1468 +1479 @@
-        e->type = type;
-    }
-e1->op == TOKarrayliteral
+(e1->op == TOKarrayliteral || e1->op == TOKnull)
-    e1->type->toBasetype()->nextOf()->equals(e2->type))
-    {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    e = es1;
-

branches/dmdfe-2.0/declaration.c

@@ -87 +87 @@
- */
-
+#if V2
-void Declaration::checkModify(Loc loc, Scope *sc, Type *t)
-{
@@ -148 +149 @@
-    }
-}
+#endif
-
-
@@ -660 +662 @@
-void VarDeclaration::semantic(Scope *sc)
-{
-
-
-
-
-
+
+
+
+
+
+
-    //if (strcmp(toChars(), "mul") == 0) halt();
+#endif
-
-    storage_class |= sc->stc;
@@ -1109 +1113 @@
-void VarDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
+    if (storage_class & STCconst)
+    buf->writestring("const ");
+    if (storage_class & STCstatic)
+    buf->writestring("static ");
+    if (storage_class & STCauto)
+    buf->writestring("auto ");
+#if V2
-    if (storage_class & STCmanifest)
-    buf->writestring("manifest ");
-    if (storage_class & STCstatic)
-    buf->writestring("static ");
-    if (storage_class & STCtls)
-    buf->writestring("__tls ");
-    if (storage_class & STCconst)
-    buf->writestring("const ");
-    if (storage_class & STCinvariant)
-    buf->writestring("invariant ");
+    if (storage_class & STCtls)
+    buf->writestring("__thread ");
+#endif
-
-    if (type)

branches/dmdfe-2.0/declaration.h

@@ -70 +70 @@
-    STCpure     = 0x4000000,    // pure function
-    STCtls      = 0x8000000,    // thread local
+    STCalias        = 0x10000000,   // alias parameter
-};
-
@@ -257 +258 @@
-    VarDeclaration *isVarDeclaration() { return (VarDeclaration *)this; }
-};
-
-
-/**************************************************************/
@@ -567 +567 @@
-};
-
+#if V2
-struct PostBlitDeclaration : FuncDeclaration
-{
@@ -582 +583 @@
-    PostBlitDeclaration *isPostBlitDeclaration() { return this; }
-};
+#endif
-
-struct DtorDeclaration : FuncDeclaration
@@ -616 +618 @@
-
-struct StaticDtorDeclaration : FuncDeclaration
-
+
+
-    StaticDtorDeclaration(Loc loc, Loc endloc);
-    Dsymbol *syntaxCopy(Dsymbol *);

branches/dmdfe-2.0/doc.c

@@ -401 +401 @@
-void ScopeDsymbol::emitMemberComments(Scope *sc)
-{
-\n"
+ %s\n", toChars()
-    OutBuffer *buf = sc->docbuf;
-
@@ -744 +744 @@
-        (td = parent->isTemplateDeclaration()) != NULL &&
-        td->onemember == this)
-
+
+
+
-        unsigned o = buf->offset;
-        TypeFunction *tf = (TypeFunction *)type;
@@ -1582 +1584 @@
-    if (f && f->type)
-    {
-
+
+
+
+
+
+
+
-
-    if (tf->parameters)

branches/dmdfe-2.0/dsymbol.c

@@ -236 +236 @@
-}
-
+TemplateInstance *Dsymbol::inTemplateInstance()
+{
+    for (Dsymbol *parent = this->parent; parent; parent = parent->parent)
+    {
+    TemplateInstance *ti = parent->isTemplateInstance();
+    if (ti)
+        return ti;
+    }
+    return NULL;
+}
-
-int Dsymbol::isAnonymous()

branches/dmdfe-2.0/dsymbol.h

@@ -56 +56 @@
-struct WithStatement;
-struct LabelDsymbol;
-struct ScopeDsymbol;
-struct TemplateDeclaration;
-struct TemplateInstance;
@@ -116 +115 @@
-    Dsymbol *toParent();
-    Dsymbol *toParent2();
+    TemplateInstance *inTemplateInstance();
-
-    int dyncast() { return DYNCAST_DSYMBOL; }   // kludge for template.isSymbol()

branches/dmdfe-2.0/expression.c

@@ -112 +112 @@
-    precedence[TOKfunction] = PREC_primary;
-    precedence[TOKvar] = PREC_primary;
+#if V2
-    precedence[TOKdefault] = PREC_primary;
+#endif
-
-    // post
@@ -241 +243 @@
-
-        e1 = new DotVarExp(loc, e1, tcd->vthis);
-
+
+
+
-
-        // Skip up over nested functions, and get the enclosing
-        // class type.
+        int n = 0;
-        Dsymbol *s;
-        for (s = tcd->toParent();
@@ -251 +256 @@
-        {   FuncDeclaration *f = s->isFuncDeclaration();
-            if (f->vthis)
-
+