Changeset 840

Timestamp:

11/17/07 18:52:40 (10 months ago)

Author:

Gregor

Message:

rebuild/*: Merged dmdfe2 r838 (DMD 2.007)

Files:

• trunk/docs/ChangeLog (modified) (1 diff)
• trunk/rebuild/aggregate.h (modified) (6 diffs)
• trunk/rebuild/cast.c (modified) (31 diffs)
• trunk/rebuild/class.c (modified) (18 diffs)
• trunk/rebuild/constfold.c (modified) (6 diffs)
• trunk/rebuild/declaration.c (modified) (15 diffs)
• trunk/rebuild/declaration.h (modified) (11 diffs)
• trunk/rebuild/dsymbol.c (modified) (18 diffs)
• trunk/rebuild/dsymbol.h (modified) (6 diffs)
• trunk/rebuild/enum.c (modified) (1 diff)
• trunk/rebuild/expression.c (modified) (49 diffs)
• trunk/rebuild/expression.h (modified) (18 diffs)
• trunk/rebuild/func.c (modified) (17 diffs)
• trunk/rebuild/identifier.c (modified) (2 diffs)
• trunk/rebuild/idgen.c (modified) (6 diffs)
• trunk/rebuild/inifile.c (modified) (2 diffs)
• trunk/rebuild/init.c (modified) (2 diffs)
• trunk/rebuild/init.h (modified) (4 diffs)
• trunk/rebuild/inline.c (modified) (5 diffs)
• trunk/rebuild/interpret.c (modified) (13 diffs)
• trunk/rebuild/lexer.c (modified) (7 diffs)
• trunk/rebuild/lexer.h (modified) (2 diffs)
• trunk/rebuild/mangle.c (modified) (4 diffs)
• trunk/rebuild/mars.c (modified) (4 diffs)
• trunk/rebuild/mars.h (modified) (1 diff)
• trunk/rebuild/mtype.c (modified) (45 diffs)
• trunk/rebuild/mtype.h (modified) (19 diffs)
• trunk/rebuild/opover.c (modified) (2 diffs)
• trunk/rebuild/optimize.c (modified) (13 diffs)
• trunk/rebuild/parse.c (modified) (8 diffs)
• trunk/rebuild/parse.h (modified) (1 diff)
• trunk/rebuild/statement.c (modified) (13 diffs)
• trunk/rebuild/statement.h (modified) (2 diffs)
• trunk/rebuild/staticassert.c (modified) (1 diff)
• trunk/rebuild/template.c (modified) (33 diffs)
• trunk/rebuild/template.h (modified) (3 diffs)
• trunk/rebuild/traits.c (modified) (3 diffs)

trunk/docs/ChangeLog

@@ -5 +5 @@
-        - DSSS no longer builds libraries or performs incremental compilation
-          with DMD, as neither of these build strategies is supportable.
+        - Rebuild: Merged DMD 2.007.
-
-0.73 from 0.72:

trunk/rebuild/aggregate.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -149 +149 @@
-};
-
-2
+6
-
-struct ClassDeclaration : AggregateDeclaration
@@ -176 +176 @@
-
-    ClassInfoDeclaration *vclassinfo;   // the ClassInfo object for this ClassDeclaration
-
+
+
-    int isauto;             // !=0 if this is an auto class
-    int isabstract;         // !=0 if abstract class
@@ -193 +194 @@
-
-    Dsymbol *search(Loc, Identifier *ident, int flags);
+    int isFuncHidden(FuncDeclaration *fd);
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);
-    int isNested();
-    int isCOMclass();
+    virtual int isCOMinterface();
+    virtual int isCPPinterface();
-    int isAbstract();
-    virtual int vtblOffset();
@@ -220 +224 @@
-struct InterfaceDeclaration : ClassDeclaration
-{
+    int cpp;                // !=0 if this is a C++ interface
+
-    InterfaceDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
@@ -227 +233 @@
-    char *kind();
-    int vtblOffset();
+    int isCPPinterface();
+    virtual int isCOMinterface();
-
-    InterfaceDeclaration *isInterfaceDeclaration() { return this; }

trunk/rebuild/cast.c

@@ -96 +96 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
+    //static int nest; if (++nest == 10) halt();
-    if (!type)
-    {   //error("%s is not an expression", toChars());
@@ -101 +102 @@
-    }
-    Expression *e = optimize(WANTvalue | WANTflags);
+    if (e->type == t)
+    return MATCHexact;
-    if (e != this)
-
+i
-    return e->implicitConvTo(t);
-    }
@@ -481 +484 @@
-    {
-    // Look for pointers to functions where the functions are overloaded.
-    VarExp *ve;
-    FuncDeclaration *f;
-
-    t = t->toBasetype();
+
+    if (e1->op == TOKoverloadset &&
+        (t->ty == Tpointer || t->ty == Tdelegate) && t->nextOf()->ty == Tfunction)
+    {   OverExp *eo = (OverExp *)e1;
+        FuncDeclaration *f = NULL;
+        for (int i = 0; i < eo->vars->a.dim; i++)
+        {   Dsymbol *s = (Dsymbol *)eo->vars->a.data[i];
+        FuncDeclaration *f2 = s->isFuncDeclaration();
+        assert(f2);
+        if (f2->overloadExactMatch(t->nextOf()))
+        {   if (f)
+            /* Error if match in more than one overload set,
+             * even if one is a 'better' match than the other.
+             */
+            ScopeDsymbol::multiplyDefined(loc, f, f2);
+            else
+            f = f2;
+            result = MATCHexact;
+        }
+        }
+    }
+
-    if (type->ty == Tpointer && type->nextOf()->ty == Tfunction &&
-        t->ty == Tpointer && t->nextOf()->ty == Tfunction &&
@@ -494 +517 @@
-         */
-        assert(0);
-
-
+VarExp *
+FuncDeclaration *
-        if (f && f->overloadExactMatch(t->nextOf()))
-        result = MATCHexact;
@@ -593 +616 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
+    if (type == t)
+    return this;
-    e = this;
-    tb = t->toBasetype();
@@ -693 +718 @@
-Expression *StringExp::castTo(Scope *sc, Type *t)
-{
+    /* This follows copy-on-write; any changes to 'this'
+     * will result in a copy.
+     * The this->string member is considered immutable.
+     */
-    StringExp *se;
-    Type *tb;
-unique
+copied = 0
-
-    //printf("StringExp::castTo(t = %s), '%s' committed = %d\n", t->toChars(), toChars(), committed);
@@ -703 +732 @@
-    error("cannot convert string literal to void*");
-    } */
+
+    se = this;
+    if (!committed)
+    {   se = (StringExp *)copy();
+    se->committed = 1;
+    copied = 1;
+    }
+
+    if (type == t)
+    {
+    return se;
+    }
-
-    tb = t->toBasetype();
@@ -709 +750 @@
-    return Expression::castTo(sc, t);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    return se;
-    }
-
-    if (tb->ty != Tsarray && tb->ty != Tarray && tb->ty != Tpointer)
-
+
+
+
+
-    goto Lcast;
-    }
-
-
+
+
+
+
+
-    goto Lcast;
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    goto Lcast;
-    }
-
-    se->committed = 1;
-
-    int tfty;
-    int ttty;
-    char *p;
-    size_t u;
-    unsigned c;
-    size_t newlen;
-
-#define X(tf,tt)    ((tf) * 256 + (tt))
-    {
-    OutBuffer buffer;
-
-tfty = se->type
-
+size_t 
+int tfty = typeb
+int 
-    switch (X(tfty, ttty))
-    {
@@ -772 +805 @@
-
-    case X(Tchar, Twchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -785 +818 @@
-
-    case X(Tchar, Tdchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -797 +830 @@
-
-    case X(Twchar,Tchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -810 +843 @@
-
-    case X(Twchar,Tdchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -822 +855 @@
-
-    case X(Tdchar,Tchar):
-
-
-
+size_t 
+
+unsigned 
-        if (!utf_isValidDchar(c))
-            error("invalid UCS-32 char \\U%08x", c);
@@ -836 +869 @@
-
-    case X(Tdchar,Twchar):
-
-
-
+size_t 
+
+unsigned 
-        if (!utf_isValidDchar(c))
-            error("invalid UCS-32 char \\U%08x", c);
@@ -850 +883 @@
-
-    L1:
-
-
+
+
+
+
-        se->string = buffer.extractData();
-        se->len = newlen;
@@ -858 +893 @@
-
-    default:
-
-
-
-
+
-        goto Lcast;
-    }
-    }
-#undef X
+L2:
+    assert(copied);
-
-    // See if need to truncate or extend the literal
@@ -877 +911 @@
-    if (dim2 != se->len)
-    {
+        // Copy when changing the string literal
-        unsigned newsz = se->sz;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    }
@@ -906 +930 @@
-Lcast:
-    Expression *e = new CastExp(loc, se, t);
-
+   // so semantic() won't be run on e
-    return e;
-}
@@ -925 +949 @@
-    {
-    // Look for pointers to functions where the functions are overloaded.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (type->ty == Tpointer && type->nextOf()->ty == Tfunction &&
@@ -932 +982 @@
-        e1->op == TOKvar)
-    {
-
-
+VarExp *
+FuncDeclaration *
-        if (f)
-        {
+        assert(0);  // should be SymOffExp instead
-        f = f->overloadExactMatch(tb->nextOf());
-        if (f)
@@ -967 +1018 @@
-Expression *ArrayLiteralExp::castTo(Scope *sc, Type *t)
-{
+#if 0
+    printf("ArrayLiteralExp::castTo(this=%s, type=%s, t=%s)\n",
+    toChars(), type->toChars(), t->toChars());
+#endif
+    if (type == t)
+    return this;
-    Type *typeb = type->toBasetype();
-    Type *tb = t->toBasetype();
@@ -1061 +1118 @@
-            e->type = t;
-            }
+            f->tookAddressOf = 1;
-            return e;
-        }
@@ -1102 +1160 @@
-            if (f->tintro && f->tintro->nextOf()->isBaseOf(f->type->nextOf(), &offset) && offset)
-            error("%s", msg);
+            f->tookAddressOf = 1;
-            e = new DelegateExp(loc, e1, f);
-            e->type = t;
@@ -1115 +1174 @@
-    {   int offset;
-
+    func->tookAddressOf = 1;
-    if (func->tintro && func->tintro->nextOf()->isBaseOf(func->type->nextOf(), &offset) && offset)
-        error("%s", msg);
@@ -1154 +1214 @@
-    Type *t = Type::tptrdiff_t;
-
-
+loc
-    if (!t->equals(t2b))
-        e2 = e2->castTo(sc, t);
@@ -1167 +1227 @@
-    Expression *e;
-
-
+loc
-    if (!t->equals(t1b))
-        e = e1->castTo(sc, t);
@@ -1192 +1252 @@
-    TY ty;
-
-\n"
+ %s\n", toChars()
-    //dump(0);
-
@@ -1262 +1322 @@
-    if ((t1->ty == Tsarray || t1->ty == Tarray) &&
-        (t2->ty == Tsarray || t2->ty == Tarray) &&
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    }
@@ -1291 +1358 @@
-    else if (t1n->mod != t2n->mod)
-    {
-->constOf
-->constOf
+n->mutableOf()->constOf()->pointerTo
+n->mutableOf()->constOf()->pointerTo
-        goto Lagain;
-    }
@@ -1347 +1414 @@
-        )
-    {
-
-
+
+
+
+
+
+
+
+
+
-    goto Lagain;
-    }
@@ -1420 +1494 @@
-    if (!type)
-    type = t;
+#if 0
+    printf("-BinExp::typeCombine() %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 this;

trunk/rebuild/class.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -148 +148 @@
-        }
-
+#if V2
-        if (id == Id::TypeInfo_Const)
-        {   if (Type::typeinfoconst)
@@ -159 +160 @@
-        Type::typeinfoinvariant = this;
-        }
+#endif
-    }
-
@@ -181 +183 @@
-
-    com = 0;
-#if 0
-    if (id == Id::IUnknown)     // IUnknown is the root of all COM objects
-    com = 1;
-#endif
-    isauto = 0;
-    isabstract = 0;
@@ -261 +259 @@
-    methods.setDim(0);
-#endif
+
+    if (sc->stc & STCdeprecated)
+    {
+    isdeprecated = 1;
+    }
+
+    if (sc->linkage == LINKcpp)
+    error("cannot create C++ classes");
-
-    // Expand any tuples in baseclasses[]
@@ -299 +305 @@
-    {
-        tc = (TypeClass *)(tb);
+
+        if (tc->sym->isDeprecated())
+        {
+        if (!isDeprecated())
+        {
+            // Deriving from deprecated class makes this one deprecated too
+            isdeprecated = 1;
+
+            tc->checkDeprecated(loc, sc);
+        }
+        }
+
-        if (tc->sym->isInterfaceDeclaration())
-        ;
@@ -353 +371 @@
-    else
-    {
+        if (tc->sym->isDeprecated())
+        {
+        if (!isDeprecated())
+        {
+            // Deriving from deprecated class makes this one deprecated too
+            isdeprecated = 1;
+
+            tc->checkDeprecated(loc, sc);
+        }
+        }
+
-        // Check for duplicate interfaces
-        for (size_t j = (baseClass ? 1 : 0); j < i; j++)
@@ -493 +522 @@
-    if (storage_class & STCabstract)
-    isabstract = 1;
-    if (storage_class & STCdeprecated)
-    isdeprecated = 1;
-
-    sc = sc->push(this);
@@ -767 +794 @@
-}
-
+/**********************************************************
+ * fd is in the vtbl[] for this class.
+ * Return 1 if function is hidden (not findable through search).
+ */
+
+#if V2
+int isf(void *param, FuncDeclaration *fd)
+{
+    //printf("param = %p, fd = %p %s\n", param, fd, fd->toChars());
+    return param == fd;
+}
+
+int ClassDeclaration::isFuncHidden(FuncDeclaration *fd)
+{
+    //printf("ClassDeclaration::isFuncHidden(%s)\n", fd->toChars());
+    Dsymbol *s = search(0, fd->ident, 4|2);
+    if (!s)
+    {   //printf("not found\n");
+    /* Because, due to a hack, if there are multiple definitions
+     * of fd->ident, NULL is returned.
+     */
+    return 0;
+    }
+    s = s->toAlias();
+    OverloadSet *os = s->isOverloadSet();
+    if (os)
+    {
+    for (int i = 0; i < os->a.dim; i++)
+    {   Dsymbol *s = (Dsymbol *)os->a.data[i];
+        FuncDeclaration *f2 = s->isFuncDeclaration();
+        if (f2 && overloadApply(f2, &isf, fd))
+        return 0;
+    }
+    return 1;
+    }
+    else
+    {
+    FuncDeclaration *fdstart = s->isFuncDeclaration();
+    //printf("%s fdstart = %p\n", s->kind(), fdstart);
+    return !overloadApply(fdstart, &isf, fd);
+    }
+}
+#endif
+
-/****************
- * Find virtual function matching identifier and type.
@@ -804 +875 @@
-
-void ClassDeclaration::interfaceSemantic(Scope *sc)
-
+
+
-
-    vtblInterfaces = new BaseClasses();
-    vtblInterfaces->reserve(interfaces_dim);
-
-
+size_t 
-    {
-    BaseClass *b = interfaces[i];
@@ -815 +887 @@
-    // If this is an interface, and it derives from a COM interface,
-    // then this is a COM interface too.
-class
+interface
-        com = 1;
+
+    if (b->base->isCPPinterface() && id)
+        id->cpp = 1;
-
-    vtblInterfaces->push(b);
@@ -829 +904 @@
-{
-    return com;
+}
+
+int ClassDeclaration::isCOMinterface()
+{
+    return 0;
+}
+
+int ClassDeclaration::isCPPinterface()
+{
+    return 0;
-}
-
@@ -897 +982 @@
-{
-    com = 0;
-
-
+
+
+
+
+
-}
-
@@ -938 +1026 @@
-    scx = scope;        // save so we don't make redundant copies
-    scope = NULL;
+    }
+
+    if (sc->stc & STCdeprecated)
+    {
+    isdeprecated = 1;
-    }
-
@@ -961 +1054 @@
-    }
-
+    if (!baseclasses.dim && sc->linkage == LINKcpp)
+    cpp = 1;
+
-    // Check for errors, handle forward references
-    for (i = 0; i < baseclasses.dim; )
@@ -1057 +1153 @@
-    sc = sc->push(this);
-    sc->parent = this;
-class
+interface
-    sc->linkage = LINKwindows;
+    else if (isCPPinterface())
+    sc->linkage = LINKcpp;
-    sc->structalign = 8;
-    structalign = sc->structalign;
@@ -1147 +1245 @@
-/****************************************
- * Determine if slot 0 of the vtbl[] is reserved for something else.
-classi
+ClassI
- * For COM interfaces, no.
- * For non-COM interfaces, yes, this is where the Interface ptr goes.
@@ -1154 +1252 @@
-int InterfaceDeclaration::vtblOffset()
-{
-class
+interface() || isCPPinterface
-    return 0;
-    return 1;
+}
+
+int InterfaceDeclaration::isCOMinterface()
+{
+    return com;
+}
+
+int InterfaceDeclaration::isCPPinterface()
+{
+    return cpp;
-}
-

trunk/rebuild/constfold.c

@@ -690 +690 @@
-    assert(op == TOKequal || op == TOKnotequal);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {   StringExp *es1 = (StringExp *)e1;
-    StringExp *es2 = (StringExp *)e2;
@@ -722 +750 @@
-            return EXP_CANT_INTERPRET;
-        cmp = v->toInteger();
+        if (cmp == 0)
+            break;
+        }
+    }
+    }
+    else if (e1->op == TOKarrayliteral && e2->op == TOKstring)
+    {   // Swap operands and use common code
+    Expression *e = e1;
+    e1 = e2;
+    e2 = e;
+    goto Lsa;
+    }
+    else if (e1->op == TOKstring && e2->op == TOKarrayliteral)
+    {
+     Lsa:
+    StringExp *es1 = (StringExp *)e1;
+    ArrayLiteralExp *es2 = (ArrayLiteralExp *)e2;
+    size_t dim1 = es1->len;
+    size_t dim2 = es2->elements ? es2->elements->dim : 0;
+    if (dim1 != dim2)
+        cmp = 0;
+    else
+    {
+        for (size_t i = 0; i < dim1; i++)
+        {
+        uinteger_t c = es1->charAt(i);
+        Expression *ee2 = (Expression *)es2->elements->data[i];
+        if (ee2->isConst() != 1)
+            return EXP_CANT_INTERPRET;
+        cmp = (c == ee2->toInteger());
-        if (cmp == 0)
-            break;
@@ -814 +872 @@
-    int cmp;
-
-
+
+
+
+
+
-    {
-    SymOffExp *es1 = (SymOffExp *)e1;
@@ -1076 +1138 @@
-    else
-    {
-
+loc, 
-    e = new IntegerExp(loc, 0, type);
-    }
@@ -1123 +1185 @@
-
-    if (i >= es1->len) {}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        e = new IntegerExp(loc, value, type);
-    }
@@ -1273 +1316 @@
-    //printf("\tt1 = %s, t2 = %s\n", t1->toChars(), t2->toChars());
-
-e2->op == TOKint64
+(e2->op == TOKint64 || e2->op == TOKstructliteral)
-    {   e = e2;
-    goto L2;
-    }
-e1->op == TOKint64
+(e1->op == TOKint64 || e1->op == TOKstructliteral)
-    {   e = e1;
-     L2:

trunk/rebuild/declaration.c

@@ -446 +446 @@
-    {
-    // Try to convert Expression to Dsymbol
-
-{   s = ((VarExp *)e)->var;
+
+if (s)
-        goto L2;
-
-
-
-
-
-
-
-
-
+
+
-    }
-    else if (t)
@@ -595 +588 @@
-    offset = 0;
-    noauto = 0;
-    nestedref = 0;
-    inuse = 0;
-    ctorinit = 0;
@@ -602 +594 @@
-    canassign = 0;
-    value = NULL;
+    scope = NULL;
-}
-
@@ -649 +642 @@
-{
-    //printf("VarDeclaration::semantic('%s', parent = '%s')\n", toChars(), sc->parent->toChars());
-
+
+
-    //printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
@@ -747 +741 @@
-    }
-
+Lagain:
-    if (isConst())
-    {
+    /* Rewrite things like: