Changeset 900

Timestamp:

06/29/08 18:26:21 (3 months ago)

Author:

Gregor

Message:

MERGE: DMD 2.012

Files:

• branches/dmdfe-2.0/aggregate.h (modified) (1 diff)
• branches/dmdfe-2.0/attrib.c (modified) (5 diffs)
• branches/dmdfe-2.0/cast.c (modified) (5 diffs)
• branches/dmdfe-2.0/class.c (modified) (8 diffs)
• branches/dmdfe-2.0/declaration.c (modified) (5 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (3 diffs)
• branches/dmdfe-2.0/e2ir.c (modified) (3 diffs)
• branches/dmdfe-2.0/expression.c (modified) (6 diffs)
• branches/dmdfe-2.0/expression.h (modified) (2 diffs)
• branches/dmdfe-2.0/func.c (modified) (14 diffs)
• branches/dmdfe-2.0/idgen.c (modified) (1 diff)
• branches/dmdfe-2.0/interpret.c (modified) (4 diffs)
• branches/dmdfe-2.0/lexer.c (modified) (3 diffs)
• branches/dmdfe-2.0/lexer.h (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (4 diffs)
• branches/dmdfe-2.0/mars.h (modified) (1 diff)
• branches/dmdfe-2.0/module.c (modified) (1 diff)
• branches/dmdfe-2.0/mtype.c (modified) (27 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (1 diff)
• branches/dmdfe-2.0/opover.c (modified) (2 diffs)
• branches/dmdfe-2.0/optimize.c (modified) (7 diffs)
• branches/dmdfe-2.0/parse.c (modified) (14 diffs)
• branches/dmdfe-2.0/parse.h (modified) (1 diff)
• branches/dmdfe-2.0/statement.c (modified) (5 diffs)
• branches/dmdfe-2.0/statement.h (modified) (1 diff)
• branches/dmdfe-2.0/struct.c (modified) (1 diff)
• branches/dmdfe-2.0/template.c (modified) (17 diffs)
• branches/dmdfe-2.0/template.h (modified) (6 diffs)
• branches/dmdfe-2.0/tocsym.c (modified) (1 diff)
• branches/dmdfe-2.0/todt.c (modified) (1 diff)
• branches/dmdfe-2.0/toir.c (modified) (1 diff)
• branches/dmdfe-2.0/toobj.c (modified) (2 diffs)
• branches/dmdfe-2.0/traits.c (modified) (1 diff)
• branches/dmdfe-2.0/typinf.c (modified) (1 diff)

branches/dmdfe-2.0/aggregate.h

@@ -200 +200 @@
-    VarDeclaration *vthis;      // 'this' parameter if this class is nested
-
+    int inuse;              // to prevent recursive attempts
+
-    ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);

branches/dmdfe-2.0/attrib.c

@@ -288 +288 @@
-    if (stc & (STCauto | STCscope | STCstatic | STCextern | STCmanifest))
-        sc->stc &= ~(STCauto | STCscope | STCstatic | STCextern | STCmanifest);
+    if (stc & (STCauto | STCscope | STCstatic | STCtls | STCmanifest))
+        sc->stc &= ~(STCauto | STCscope | STCstatic | STCtls | STCmanifest);
-    if (stc & (STCconst | STCinvariant | STCmanifest))
-        sc->stc &= ~(STCconst | STCinvariant | STCmanifest);
@@ -324 +326 @@
-    { STCdeprecated,   TOKdeprecated },
-    { STCoverride,     TOKoverride },
+    { STCnothrow,      TOKnothrow },
+    { STCpure,         TOKpure },
+    { STCtls,          TOKtls },
-    };
-
@@ -588 +593 @@
-    sc = sc->push();
-    sc->anonAgg = &aad;
-
+ | STCtls
-    sc->inunion = isunion;
-    sc->offset = 0;
@@ -818 +823 @@
-    goto Lnodecl;
-    }
+    else if (global.params.ignoreUnsupportedPragmas)
+    {
+    if (global.params.verbose)
+    {
+        /* Print unrecognized pragmas
+         */
+        printf("pragma    %s", ident->toChars());
+        if (args)
+        {
+        for (size_t i = 0; i < args->dim; i++)
+        {
+            Expression *e = (Expression *)args->data[i];
+            e = e->semantic(sc);
+            e = e->optimize(WANTvalue | WANTinterpret);
+            if (i == 0)
+            printf(" (");
+            else
+            printf(",");
+            printf("%s", e->toChars());
+        }
+        if (args->dim)
+            printf(")");
+        }
+        printf("\n");
+    }
+    goto Lnodecl;
+    }
-    else
-    error("unrecognized pragma(%s)", ident->toChars());
@@ -850 +882 @@
-void PragmaDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    AttribDeclaration::toCBuffer(buf, hgs);
-}

branches/dmdfe-2.0/cast.c

@@ -1 +1 @@
-
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -32 +32 @@
-Expression *Expression::implicitCastTo(Scope *sc, Type *t)
-{
-
-
+
-
-    MATCH match = implicitConvTo(t);
@@ -104 +103 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
-5
+1
-    if (!type)
-    {   error("%s is not an expression", toChars());
@@ -1087 +1086 @@
-{
-#if 0
-t=
+=> 
-    toChars(), type->toChars(), t->toChars());
-#endif
@@ -1097 +1096 @@
-    if ((tb->ty == Tarray || tb->ty == Tsarray) &&
-    (typeb->ty == Tarray || typeb->ty == Tsarray) &&
-
+
+
-    {
-    if (tb->ty == Tsarray)

branches/dmdfe-2.0/class.c

@@ -187 +187 @@
-    isnested = 0;
-    vthis = NULL;
+    inuse = 0;
-}
-
@@ -530 +531 @@
-    sc = sc->push(this);
-    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-
+ | STCtls
-    sc->stc |= storage_class & (STCconst | STCinvariant);
-    sc->parent = this;
@@ -575 +576 @@
-    scope->module->addDeferredSemantic(this);
-
-
+ due to forward references
-    return;
-    }
@@ -1014 +1015 @@
-
-    //printf("InterfaceDeclaration::semantic(%s), type = %p\n", toChars(), type);
+    if (inuse)
+    return;
-    if (!scope)
-    {   type = type->semantic(loc, sc);
@@ -1101 +1104 @@
-        continue;
-        }
-
+ || b->base->inuse
-        {
-        //error("forward reference of base class %s", baseClass->toChars());
@@ -1168 +1171 @@
-    sc = sc->push(this);
-    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-
+ | STCtls
-    sc->stc |= storage_class & (STCconst | STCinvariant);
-    sc->parent = this;
@@ -1178 +1181 @@
-    structalign = sc->structalign;
-    sc->offset = 8;
+    inuse++;
-    for (i = 0; i < members->dim; i++)
-    {
@@ -1183 +1187 @@
-    s->semantic(sc);
-    }
+    inuse--;
-    //members->print();
-    sc->pop();

branches/dmdfe-2.0/declaration.c

@@ -803 +803 @@
-    }
-
-
+ | STCtls
-    {
-    }
@@ -812 +812 @@
-        aad = parent->isAggregateDeclaration();
-    if (aad)
-
+ | STCtls
-
-        if (storage_class & (STCconst | STCinvariant) && init)
@@ -854 +854 @@
-    if (type->isauto() && !noauto)
-    {
-
+ | STCtls
-    {
-        error("globals, statics, fields, manifest constants, ref and out parameters cannot be auto");
@@ -1113 +1113 @@
-    if (storage_class & STCstatic)
-    buf->writestring("static ");
+    if (storage_class & STCtls)
+    buf->writestring("__tls ");
-    if (storage_class & STCconst)
-    buf->writestring("const ");
@@ -1284 +1286 @@
-    }
-    return canTakeAddressOf() &&
-
+ | STCtls
-     toParent()->isModule() ||
-     toParent()->isTemplateInstance());

branches/dmdfe-2.0/declaration.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -68 +68 @@
-    STCnodtor       = 0x1000000,    // don't run destructor
-    STCnothrow      = 0x2000000,    // never throws exceptions
+    STCpure     = 0x4000000,    // pure function
+    STCtls      = 0x8000000,    // thread local
-};
-
@@ -483 +485 @@
-    void bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int overrides(FuncDeclaration *fd);
+    int findVtblIndex(Array *vtbl, int dim);
-    int overloadInsert(Dsymbol *s);
-    FuncDeclaration *overloadExactMatch(Type *t);
-    FuncDeclaration *overloadResolve(Loc loc, Expression *ethis, Expressions *arguments, int flags = 0);
+    MATCH leastAsSpecialized(FuncDeclaration *g);
-    LabelDsymbol *searchLabel(Identifier *ident);
-    AggregateDeclaration *isThis();

branches/dmdfe-2.0/e2ir.c

@@ -4115 +4115 @@
-    {
-    // set to:
-value
+index
-
-    TypeAArray *taa = (TypeAArray *)t1;
@@ -4124 +4124 @@
-    Symbol *s;
-
+    // n2 becomes the index, also known as the key
-    n2 = e2->toElem(irs);
-
+ || n2->Ety == TYarray
-    {
-        n2 = el_una(OPstrpar, TYstruct, n2);
-        n2->Enumbytes = n2->E1->Enumbytes;
+        //printf("numbytes = %d\n", n2->Enumbytes);
-        assert(n2->Enumbytes);
-    }
-    valuesize = el_long(TYuint, vsize); // BUG: should be TYsize_t
+    //printf("valuesize: "); elem_print(valuesize);
-    if (modifiable)
-    {
@@ -4141 +4144 @@
-        s = taa->aaGetSymbol("GetRvalue", 1);
-    }
-key = %s\n", taa->key
+index = %s\n", taa->index
-    keyti = taa->index->getInternalTypeInfo(NULL)->toElem(irs);
+    //keyti = taa->index->getTypeInfo(NULL)->toElem(irs);
-    //printf("keyti:\n");
-    //elem_print(keyti);

branches/dmdfe-2.0/expression.c

@@ -112 +112 @@
-    precedence[TOKfunction] = PREC_primary;
-    precedence[TOKvar] = PREC_primary;
+    precedence[TOKdefault] = PREC_primary;
-
-    // post
@@ -478 +479 @@
-            break;
-        }
-
+
+
+
+
+
+
+
-        arguments->push(arg);
-        nargs++;
@@ -2056 +2063 @@
-
-Lerr:
-allow
-int32
+defin
+error
-    return this;
-}
@@ -5236 +5243 @@
-                e1->type = s->isClassDeclaration()->type;
-
+            e1 = e1->semantic(sc); // get corrected nested refs
-            goto L1;
-            }
@@ -5241 +5249 @@
-            printf("2: ");
-#endif
-thi
-
+%
+e1->toChars(), 
-        }
-        }
@@ -9231 +9239 @@
-
-
+/****************************************************************/
+
+DefaultInitExp::DefaultInitExp(Loc loc, enum TOK subop, int size)
+    : Expression(loc, TOKdefault, size)
+{
+    this->subop = subop;
+}
+
+void DefaultInitExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring(Token::toChars(subop));
+}
+
+/****************************************************************/
+
+FileInitExp::FileInitExp(Loc loc)
+    : DefaultInitExp(loc, TOKfile, sizeof(FileInitExp))
+{
+}
+
+Expression *FileInitExp::semantic(Scope *sc)
+{
+    //printf("FileInitExp::semantic()\n");
+    type = Type::tchar->invariantOf()->arrayOf();
+    return this;
+}
+
+Expression *FileInitExp::resolve(Loc loc, Scope *sc)
+{
+    //printf("FileInitExp::resolve() %s\n", toChars());
+    char *s = loc.filename ? loc.filename : sc->module->ident->toChars();
+    Expression *e = new StringExp(loc, s);
+    e = e->semantic(sc);
+    e = e->castTo(sc, type);
+    return e;
+}
+
+/****************************************************************/
+
+LineInitExp::LineInitExp(Loc loc)
+    : DefaultInitExp(loc, TOKline, sizeof(LineInitExp))
+{
+}
+
+Expression *LineInitExp::semantic(Scope *sc)
+{
+    type = Type::tint32;
+    return this;
+}
+
+Expression *LineInitExp::resolve(Loc loc, Scope *sc)
+{
+    Expression *e = new IntegerExp(loc, loc.linnum, Type::tint32);
+    e = e->castTo(sc, type);
+    return e;
+}
+
+

branches/dmdfe-2.0/expression.h

@@ -62 +62 @@
-Expression *resolveProperties(Scope *sc, Expression *e);
-void accessCheck(Loc loc, Scope *sc, Expression *e, Declaration *d);
+Expression *build_overload(Loc loc, Scope *sc, Expression *ethis, Expression *earg, Identifier *id);
-Dsymbol *search_function(ScopeDsymbol *ad, Identifier *funcid);
-void inferApplyArgTypes(enum TOK op, Arguments *arguments, Expression *aggr);
@@ -1325 +1326 @@
-/****************************************************************/
-
+struct DefaultInitExp : Expression
+{
+    enum TOK subop;     // which of the derived classes this is
+
+    DefaultInitExp(Loc loc, enum TOK subop, int size);
+    virtual Expression *resolve(Loc loc, Scope *sc) = 0;
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+};
+
+struct FileInitExp : DefaultInitExp
+{
+    FileInitExp(Loc loc);
+    Expression *semantic(Scope *sc);
+    Expression *resolve(Loc loc, Scope *sc);
+};
+
+struct LineInitExp : DefaultInitExp
+{
+    LineInitExp(Loc loc);
+    Expression *semantic(Scope *sc);
+    Expression *resolve(Loc loc, Scope *sc);
+};
+
+/****************************************************************/
+
-/* Special values used by the interpreter
- */

branches/dmdfe-2.0/func.c

@@ -36 +36 @@
-    : Declaration(id)
-{
+    //printf("FuncDeclaration(id = '%s', type = %p)\n", id->toChars(), type);
-    this->storage_class = storage_class;
-    this->type = type;
@@ -108 +109 @@
-    printf("\tFuncLiteralDeclaration()\n");
-    printf("sc->parent = %s\n", sc->parent->toChars());
-s\n"
+p, %s\n", type
-#endif
-
@@ -305 +306 @@
-
-    // Find index of existing function in vtbl[] to override
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Go through all the interface bases.
@@ -422 +406 @@
-    {
-        BaseClass *b = cd->interfaces[i];
-
+
+
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
+
+
+
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            }
-
-
-
-
-
-
-
-
-
+
-            }
-
-
-
-
-
+
-        }
-        }
@@ -660 +632 @@
-    sc2->fes = fes;
-    sc2->linkage = LINKd;
-
+ | STCtls
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
@@ -683 +655 @@
-        assert(ad->handle);
-        Type *thandle = ad->handle;
-
+ || type->isConst()
-        {
-            if (thandle->ty == Tclass)
@@ -692 +664 @@
-            }
-        }
-
+ || type->isInvariant()
-        {
-            if (thandle->ty == Tclass)
@@ -1362 +1334 @@
-}
-
+/*************************************************
+ * Find index of function in vtbl[0..dim] that
+ * this function overrides.
+ * Returns:
+ *  -1  didn't find one
+ *  -2  can't determine because of forward references
+ */
+
+int FuncDeclaration::findVtblIndex(Array *vtbl, int dim)
+{
+    for (int vi = 0; vi < dim; vi++)
+    {
+    FuncDeclaration *fdv = ((Dsymbol *)vtbl->data[vi])->isFuncDeclaration();
+    if (fdv && fdv->ident == ident)
+    {
+        int cov = type->covariant(fdv->type);
+        //printf("\tbaseclass cov = %d\n", cov);
+        switch (cov)
+        {
+        case 0:     // types are distinct
+            break;
+
+        case 1:
+            return vi;
+
+        case 2:
+            //type->print();
+            //fdv->type->print();
+            //printf("%s %s\n", type->deco, fdv->type->deco);
+            error("of type %s overrides but is not covariant with %s of type %s",
+            type->toChars(), fdv->toPrettyChars(), fdv->type->toChars());
+            break;
+
+        case 3:
+            return -2;  // forward references
+
+        default:
+            assert(0);
+        }
+    }
+    }
+    return -1;
+}
+
-/****************************************************
- * Overload this FuncDeclaration with the new one f.
@@ -1564 +1580 @@
-    if (f != m->lastf)      // skip duplicates
-    {
-    TypeFunction *tf;
-
-    m->anyf = f;
-
+TypeFunction *
-    match = (MATCH) tf->callMatch(f->needThis() ? p->ethis : NULL, arguments);
-    //printf("match = %d\n", match);
@@ -1584 +1598 @@
-        else if (f->overrides(m->lastf))
-        goto LfIsBetter;
+
+        /* Try to disambiguate using template-style partial ordering rules.
+         * In essence, if f() and g() are ambiguous, if f() can call g(),
+         * but g() cannot call f(), then pick f().
+         * This is because f() is "more specialized."
+         */
+        {
+        MATCH c1 = f->leastAsSpecialized(m->lastf);
+        MATCH c2 = m->lastf->leastAsSpecialized(f);
+        if (c1 > c2)
+        goto LfIsBetter;
+        if (c1 < c2)
+        goto LlastIsBetter;
+        }
-
-    Lambiguous:
@@ -1686 +1714 @@
-    }
-    }
+}
+
+/*************************************
+ * Determine partial specialization order of 'this' vs g.
+ * This is very similar to TemplateDeclaration::leastAsSpecialized().
+ * Returns:
+ *  match   'this' is at least as specialized as g
+ *  0   g is more specialized than 'this'
+ */
+
+MATCH FuncDeclaration::leastAsSpecialized(FuncDeclaration *g)
+{
+#define LOG_LEASTAS     0
+
+#if LOG_LEASTAS
+    printf("%s.leastAsSpecialized(%s)\n", toChars(), g->toChars());
+#endif
+
+    /* This works by calling g() with f()'s parameters, and
+     * if that is possible, then f() is at least as specialized
+     * as g() is.
+     */
+
+    TypeFunction *tf = (TypeFunction *)type;
+    TypeFunction *tg = (TypeFunction *)g->type;
+    size_t nfparams = Argument::dim(tf->parameters);
+    size_t ngparams = Argument::dim(tg->parameters);
+    MATCH match = MATCHexact;
+
+    /* If both functions have a 'this' pointer, and the mods are not
+     * the same and g's is not const, then this is less specialized.
+     */
+    if (needThis() && g->needThis())
+    {
+    if (tf->mod != tg->mod)
+    {
+        if (tg->mod == MODconst)
+        match = MATCHconst;
+        else
+        return MATCHnomatch;
+    }
+    }
+
+    /* Create a dummy array of arguments out of the parameters to f()
+     */
+    Expressions args;
+    args.setDim(nfparams);
+    for (int u = 0; u < nfparams; u++)
+    {
+    Argument *p = Argument::getNth(tf->parameters, u);
+    Expression *e = p->type->defaultInit();
+    args.data[u] = e;
+    }
+
+    MATCH m = (MATCH) tg->callMatch(NULL, &args);
+    if (m)
+    {
+        /* A variadic template is less specialized than a
+         * non-variadic one.
+         */