Changeset 847

Timestamp:

12/20/07 16:27:15 (10 months ago)

Author:

Gregor

Message:

MERGE: dmdfe-2.0 r846 (DMD 2.008)

Files:

• trunk/rebuild/attrib.c (modified) (2 diffs)
• trunk/rebuild/cast.c (modified) (1 diff)
• trunk/rebuild/class.c (modified) (6 diffs)
• trunk/rebuild/declaration.c (modified) (17 diffs)
• trunk/rebuild/declaration.h (modified) (5 diffs)
• trunk/rebuild/doc.c (modified) (5 diffs)
• trunk/rebuild/dsymbol.c (modified) (5 diffs)
• trunk/rebuild/expression.c (modified) (33 diffs)
• trunk/rebuild/func.c (modified) (13 diffs)
• trunk/rebuild/init.c (modified) (1 diff)
• trunk/rebuild/inline.c (modified) (1 diff)
• trunk/rebuild/interpret.c (modified) (2 diffs)
• trunk/rebuild/mars.c (modified) (1 diff)
• trunk/rebuild/module.c (modified) (1 diff)
• trunk/rebuild/module.h (modified) (1 diff)
• trunk/rebuild/mtype.c (modified) (29 diffs)
• trunk/rebuild/mtype.h (modified) (7 diffs)
• trunk/rebuild/opover.c (modified) (6 diffs)
• trunk/rebuild/optimize.c (modified) (4 diffs)
• trunk/rebuild/parse.c (modified) (17 diffs)
• trunk/rebuild/parse.h (modified) (3 diffs)
• trunk/rebuild/statement.c (modified) (1 diff)
• trunk/rebuild/struct.c (modified) (3 diffs)
• trunk/rebuild/template.c (modified) (31 diffs)
• trunk/rebuild/template.h (modified) (9 diffs)

trunk/rebuild/attrib.c

@@ -310 +310 @@
-    if (stc & (STCauto | STCscope | STCstatic | STCextern))
-        sc->stc &= ~(STCauto | STCscope | STCstatic | STCextern);
+    if (stc & (STCconst | STCinvariant))
+        sc->stc &= ~(STCconst | STCinvariant);
-    sc->stc |= stc;
-    for (unsigned i = 0; i < decl->dim; i++)
@@ -338 +340 @@
-    { STCextern,       TOKextern },
-    { STCconst,        TOKconst },
+    { STCinvariant,    TOKinvariant },
-    { STCfinal,        TOKfinal },
-    { STCabstract,     TOKabstract },

trunk/rebuild/cast.c

@@ -1330 +1330 @@
-//t1 = t1->constOf();
-//t2 = t2->constOf();
-
-
+
+
+
+
+
+
+
+
-        goto Lagain;
-    }

trunk/rebuild/class.c

@@ -450 +450 @@
-    isauto = baseClass->isauto;
-    vthis = baseClass->vthis;
+    storage_class |= baseClass->storage_class & (STCconst | STCinvariant);
-    }
-    else
@@ -522 +523 @@
-    if (storage_class & STCabstract)
-    isabstract = 1;
+    if (storage_class & STCinvariant)
+    type = type->invariantOf();
+    else if (storage_class & STCconst)
+    type = type->constOf();
-
-    sc = sc->push(this);
-    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-
+
+
-    sc->parent = this;
-    sc->inunion = 0;
@@ -938 +944 @@
-}
-
+
-/****************************************
- * Returns !=0 if there's an extra member which is the 'this'
@@ -1104 +1111 @@
-        }
-    }
+#if 0
+    // Inherit const/invariant from base class
+    storage_class |= b->base->storage_class & (STCconst | STCinvariant);
+#endif
-    i++;
-    }
@@ -1145 +1156 @@
-    }
-
+    protection = sc->protection;
+    storage_class |= sc->stc & (STCconst | STCinvariant);
+
-    for (i = 0; i < members->dim; i++)
-    {
@@ -1152 +1166 @@
-
-    sc = sc->push(this);
+    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
+                 STCabstract | STCdeprecated | STCconst | STCinvariant);
+    sc->stc |= storage_class & (STCconst | STCinvariant);
-    sc->parent = this;
-    if (isCOMinterface())

trunk/rebuild/declaration.c

@@ -31 +31 @@
-{
-    type = NULL;
+    originalType = NULL;
-    storage_class = STCundefined;
-    protection = PROTundefined;
@@ -93 +94 @@
-    VarDeclaration *v = isVarDeclaration();
-    /* if (v && v->canassign == 0 &&
- || (isFinal() && !isCtorinit())
-final/
+) && !isCtorinit(
+
-
-    if (isCtorinit())
@@ -434 +435 @@
-     */
-    s = type->toDsymbol(sc);
-
+ && ((s->getType() && type->equals(s->getType())) || s->isEnumMember())
-    goto L2;            // it's a symbolic alias
-
@@ -642 +643 @@
-{
-    //printf("VarDeclaration::semantic('%s', parent = '%s')\n", toChars(), sc->parent->toChars());
-->toChars()
-
+ ? type->toChars() : "null"
+ 
-    //printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
@@ -664 +665 @@
-     */
-    storage_class &= ~STCauto;
+    originalType = type;
-    }
-    else
+    {   if (!originalType)
+        originalType = type;
-    type = type->semantic(loc, sc);
+    }
+    //printf(" type = %s\n", type ? type->toChars() : "null");
-
-    type->checkDeprecated(loc, sc);
@@ -736 +742 @@
-    }
-
-    if (storage_class & STCfinal && !init && !fd)
-    {   // Initialize by constructor only
-    storage_class |= STCctorinit;
-    }
-
-Lagain:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-    type = type->invariantOf();
-
-
-
-}
-
-type = type->toCanonConst();
-
-const | STCinvariant | STCstatic
+
+
+
+if (!type->isInvariant())
+
+}
+
+static | STCextern
-    {
-    }
@@ -794 +777 @@
-        aad = parent->isAggregateDeclaration();
-    if (aad)
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -804 +794 @@
-    }
-
+    /* Templates cannot add fields to aggregates
+     */
-    TemplateInstance *ti = parent->isTemplateInstance();
-    if (ti)
@@ -839 +831 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
-    type->size() != 0)
-    {
@@ -906 +906 @@
-        // If local variable, use AssignExp to handle all the various
-        // possibilities.
- !isConst() && !isInvariant() &&
+
-        !init->isVoidInitializer())
-        {
@@ -967 +967 @@
-        {
-        init = init->semantic(sc, type);
-
-
-
-
-
-
-
+
+
+
+
-    {
-        /* Because we may need the results of a const declaration in a
@@ -1014 +1011 @@
-        else if (ei)
-        {
-
+
+
+
+
+
+
-            if (e->op == TOKint64 || e->op == TOKstring)
-            {
@@ -1034 +1036 @@
-}
-
-ExpInitializer *VarDeclaration::getExpInitializer()
-{
-    ExpInitializer *ei;
-
-    if (init)
-    ei = init->isExpInitializer();
-    else
-    {
-    Expression *e = type->defaultInit();
-    if (e)
-        ei = new ExpInitializer(loc, e);
-    else
-        ei = NULL;
-    }
-    return ei;
-}
-
-void VarDeclaration::semantic2(Scope *sc)
-{
@@ -1084 +1069 @@
-void VarDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
+    if (storage_class & STCstatic)
+    buf->writestring("static ");
-    if (storage_class & STCconst)
-    buf->writestring("const ");
-
-
+
+
+
-    if (type)
-    type->toCBuffer(buf, ident, hgs);
@@ -1108 +1096 @@
-int VarDeclaration::isImportedSymbol()
-{
-
+
+
-    return TRUE;
-    return FALSE;
@@ -1160 +1149 @@
-}
-
+/****************************
+ * Get ExpInitializer for a variable, if there is one.
+ */
+
+ExpInitializer *VarDeclaration::getExpInitializer()
+{
+    ExpInitializer *ei;
+
+    if (init)
+    ei = init->isExpInitializer();
+    else
+    {
+    Expression *e = type->defaultInit();
+    if (e)
+        ei = new ExpInitializer(loc, e);
+    else
+        ei = NULL;
+    }
+    return ei;
+}
+
+/*******************************************
+ * If variable has a constant expression initializer, get it.
+ * Otherwise, return NULL.
+ */
+
+Expression *VarDeclaration::getConstInitializer()
+{
+    if ((isConst() || isInvariant()) &&
+    storage_class & STCinit)
+    {
+    ExpInitializer *ei = getExpInitializer();
+    if (ei)
+        return ei->exp;
+    }
+
+    return NULL;
+}
+
+/*************************************
+ * Return !=0 if we can take the address of this variable.
+ */
+
+int VarDeclaration::canTakeAddressOf()
+{
+    /* Global variables and struct/class fields of the form:
+     *  const int x = 3;
+     * are not stored and hence cannot have their address taken.
+     */
+    if ((isConst() || isInvariant()) &&
+    storage_class & STCinit &&
+    (!(storage_class & (STCstatic | STCextern)) || (storage_class & STCfield)) &&
+    (!parent || toParent()->isModule() || toParent()->isTemplateInstance()) &&
+    type->toBasetype()->isTypeBasic()
+       )
+    {
+    return 0;
+    }
+    return 1;
+}
-
-/*******************************
- * Does symbol go into data segment?
+ * Includes extern variables.
- */
-
@@ -1173 +1223 @@
-#endif
-    Dsymbol *parent = this->toParent();
-(STCstatic | STCconst)
+STCstatic
-    {   //error("forward referenced");
-halt();
-    type = Type::terror;
-    return 0;
-    }
-
-
-
+
+
+
+
-}
-

trunk/rebuild/declaration.h

@@ -64 +64 @@
-    STCinvariant    = 0x100000,
-    STCref      = 0x200000,
+    STCinit     = 0x400000,     // has explicit initializer
-};
-
@@ -75 +76 @@
-};
-
-
+
+
-int overloadApply(FuncDeclaration *fstart,
-    int (*fp)(void *, FuncDeclaration *),
@@ -85 +87 @@
-{
-    Type *type;
+    Type *originalType;     // before semantic analysis
-    unsigned storage_class;
-    enum PROT protection;
@@ -237 +240 @@
-    int isDataseg();
-    int hasPointers();
+    int canTakeAddressOf();
-    Expression *callAutoDtor();
-    ExpInitializer *getExpInitializer();
+    Expression *getConstInitializer();
-    void checkCtorConstInit();
-    void checkNestedReference(Scope *sc, Loc loc);
@@ -475 +480 @@
-    int overloadInsert(Dsymbol *s);
-    FuncDeclaration *overloadExactMatch(Type *t);
-
+ *ethis, Expression
-    LabelDsymbol *searchLabel(Identifier *ident);
-    AggregateDeclaration *isThis();

trunk/rebuild/doc.c

@@ -270 +270 @@
-
-    buf.printf("$(DDOC_COMMENT Generated by Ddoc from %s)\n", srcfile->toChars());
-
-    if (isDocFile)
-    {
@@ -284 +283 @@
-    else
-    {
-
-    dc->writeSections(sc, this, sc->docbuf);
-    emitMemberComments(sc);
@@ -655 +653 @@
-    if (d->isConst())
-        buf->writestring("const ");
+#if V2
+    if (d->isInvariant())
+        buf->writestring("invariant ");
+#endif
-    if (d->isFinal())
-        buf->writestring("final ");
@@ -664 +666 @@
-void Declaration::toDocBuffer(OutBuffer *buf)
-{
-\n", toChars()
+, originalType = %p\n", toChars(), originalType
-    if (ident)
-    {
@@ -672 +674 @@
-    {   HdrGenState hgs;
-        hgs.ddoc = 1;
-
+
+
+
+
+
+
-    }
-    else

trunk/rebuild/dsymbol.c

@@ -934 +934 @@
-        Expression *e = new IntegerExp(0, td->objects->dim, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
-
+static | STC
-        v->semantic(sc);
-        return v;
@@ -944 +944 @@
-        Expression *e = new IntegerExp(0, type->arguments->dim, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
-
+static | STC
-        v->semantic(sc);
-        return v;
@@ -990 +990 @@
-        Expression *e = new IntegerExp(0, ((StringExp *)ce)->len, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
-
+static | STC
-        }
-        else if (ce->op == TOKarrayliteral)
@@ -998 +998 @@
-        Expression *e = new IntegerExp(0, ((ArrayLiteralExp *)ce)->elements->dim, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
-
+static | STC
-        }
-        else if (ce->op == TOKtuple)
@@ -1006 +1006 @@
-        Expression *e = new IntegerExp(0, ((TupleExp *)ce)->exps->dim, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
-
+static | STC
-        }
-        *pvar = v;

trunk/rebuild/expression.c

@@ -833 +833 @@
-Expression *Expression::modifiableLvalue(Scope *sc, Expression *e)
-{
-\n", 
+, type = %s\n", toChars(), type->
-
-    // See if this expression is a modifiable lvalue (i.e. not const)
@@ -1050 +1050 @@
-    if (this == o ||
-    (((Expression *)o)->op == TOKint64 &&
-equals(ne->type
+toHeadMutable()->equals(ne->type->toHeadMutable()
-     value == ne->value))
-    return 1;
@@ -1291 +1291 @@
-char *RealExp::toChars()
-{
-static 
+
-
-#ifdef IN_GCC
@@ -1301 +1301 @@
-#endif
-    assert(strlen(buffer) < sizeof(buffer));
-buffer
+mem.strdup(buffer)
-}
-
@@ -1361 +1361 @@
-    if (this == o ||
-    (((Expression *)o)->op == TOKfloat64 &&
-equals(ne->type
+toHeadMutable()->equals(ne->type->toHeadMutable()
-     RealEquals(value, ne->value)
-        )
@@ -1505 +1505 @@
-char *ComplexExp::toChars()
-{
-static 
+
-
-#ifdef IN_GCC
@@ -1517 +1517 @@
-    assert(strlen(buffer) < sizeof(buffer));
-#endif
-buffer
+mem.strdup(buffer)
-}
-
@@ -1558 +1558 @@
-    if (this == o ||
-    (((Expression *)o)->op == TOKcomplex80 &&
-equals(ne->type
+toHeadMutable()->equals(ne->type->toHeadMutable()
-     RealEquals(creall(value), creall(ne->value)) &&
-     RealEquals(cimagl(value), cimagl(ne->value))
@@ -3133 +3133 @@
-        error("cannot create instance of interface %s", cd->toChars());
-    else if (cd->isAbstract())
-
+
+
+
+
+
+
+
-    checkDeprecated(sc, cd);
-    if (cd->isNested())
@@ -3210 +3216 @@
-    {
-        assert(f);
-
+NULL, 
-        checkDeprecated(sc, f);
-        member = f->isCtorDeclaration();
@@ -3241 +3247 @@
-        newargs->shift(e);
-
-
+NULL, 
-        allocator = f->isNewDeclaration();
-        assert(allocator);
@@ -3275 +3281 @@
-        newargs->shift(e);
-
-
+NULL, 
-        allocator = f->isNewDeclaration();
-        assert(allocator);
@@ -3304 +3310 @@
-        arg = resolveProperties(sc, arg);
-        arg = arg->implicitCastTo(sc, Type::tsize_t);
-
+
+
-        error("negative array index %s", arg->toChars()); */
-        arguments->data[i] = (void *) arg;
@@ -3502 +3509 @@
-    if (this == o ||
-    (((Expression *)o)->op == TOKvar &&
-equals(ne->type
+toHeadMutable()->equals(ne->type->toHeadMutable()
-     var == ne->var))
-    return 1;
@@ -4119 +4126 @@
-        tded = targ;
-        break;
+
+#if V2
+        case TOKconst:
+        if (!targ->isConst())
+            goto Lno;
+        tded = targ;
+        break;
+
+        case TOKinvariant:
+        if (!targ->isInvariant())
+            goto Lno;
+        tded = targ;
+        break;
+#endif
-
-        case TOKsuper:
@@ -5599 +5620 @@
-    AggregateDeclaration *ad;
-    UnaExp *ue = (UnaExp *)(e1);
-
+
-        if (e1->op == TOKdotvar)
-        {   // Do overload resolution
@@ -5606 +5627 @@
-        f = dve->var->isFuncDeclaration();
-        assert(f);
-
+ue->e1, 
-
-        ad = f->toParent()->isAggregateDeclaration();
@@ -5615 +5636 @@
-        assert(td);
-        if (!arguments)
-
+FunctionTemplate
-        arguments = new Expressions();
-(sc, loc, NULL
+FunctionTemplate(sc, loc, NULL, ue->e1
-        if (!f)
-        {   type = Type::terror;
@@ -5683 +5704 @@
-#endif
-        // Const member function can take const/invariant/mutable this
-storage_class & STCconst
+type->isConst()
-        {
-        // Check for const/invariant compatibility
@@ -5689 +5710 @@
-        if (tthis->ty == Tpointer)
-            tthis = tthis->nextOf()->toBasetype();
-storage_class & STCinvariant
+type->isInvariant()
-        {
-            /* if (tthis->mod != MODinvariant)
@@ -5697 +5718 @@
-        {
-            /* if (tthis->mod != 0)
-
+
+
+
-        }
-
@@ -5755 +5778 @@
-        sc->callSuper |= CSXany_ctor | CSXsuper_ctor;
-
-
+NULL, 
-        checkDeprecated(sc, f);
-        e1 = new DotVarExp(e1->loc, e1, f);
@@ -5789 +5812 @@
-
-        f = cd->ctor;
-
+NULL, 
-        checkDeprecated(sc, f);
-        e1 = new DotVarExp(e1->loc, e1, f);
@@ -5810 +5833 @@
-        if (f2)
-        {
-
+NULL, 
-        }
-        else
-        {   TemplateDeclaration *td = s->isTemplateDeclaration();
-        assert(td);
-(sc, loc
+FunctionTemplate(sc, loc, NULL
-        }
-        if (f2)
@@ -5861 +5884 @@
-    {
-        TemplateExp *te = (TemplateExp *)e1;
-(sc, loc
+FunctionTemplate(sc, loc, NULL
-        if (!f)
-        {   type = Type::terror;
@@ -5893 +5916 @@
-
-    if (ve->hasOverloads)
-
+NULL, 
-    checkDeprecated(sc, f);
-
@@ -5992 +6015 @@
-    {
-        DotVarExp *dve = (DotVarExp *)e1;
-        if (dve->var->isFinal())
-        type = e1->type->constOf()->pointerTo();
-
-        FuncDeclaration *f = dve->var->isFuncDeclaration();
@@ -6009 +6030 @@
-    {
-        VarExp *ve = (VarExp *)e1;
-
-
+
+
+
+
-
-        FuncDeclaration *f = ve->var->isFuncDeclaration();
@@ -6098 +6121 @@
-Expression *PtrExp::modifiableLvalue(Scope *sc, Expression *e)
-{
-\n", 
+, type %s\n", toChars(), type->
-
-    if (e1->op == TOKsymoff)
-    {   SymOffExp *se = (SymOffExp *)e1;
-    se->var->checkModify(loc, sc);
-
+//
-    }
-
@@ -7080 +7103 @@
-
-#if LOGSEMANTIC
-//
+
-#endif
-    //printf("e1->op = %d, '%s'\n", e1->op, Token::toChars(e1->op));
@@ -7245 +7268 @@
-    {   // Try to do a decent error message with the expression
-    // before it got constant folded
-
+
+
-    e1 = e1->modifiableLvalue(sc, e1old);
-    }
@@ -7948 +7972 @@
-
-    typeCombine(sc);
-
-
-
-
+
-
-    Type *tb = type->toBasetype();
-    if (tb->ty == Tsarray)
-        type = tb->nextOf()->arrayOf();
-//printf("test2\n");
-//type->print();
-    if (type->ty == Tarray && tb1->nextOf()->mod != tb2->nextOf()->mod)
-
-
-
+
-#if 0
-    e1->type->print();
@@ -8791 +8808 @@
-        break;
-    }
+    if (type->toBasetype()->ty == Tarray)
+    {
+        e1 = e1->castTo(sc, type);
+        e2 = e2->castTo(sc, type);
+    }
-    }
-#if 0

trunk/rebuild/func.c

@@ -111 +111 @@
-#endif
-
-
+
+
+
+
+
+
+
+
+
+
+
-    type = type->semantic(loc, sc);
+    if (storage_class & STCinvariant)
+    {   // Don't use toInvariant(), as that will do a merge()
+        type = type->makeInvariant();
+        type->deco = type->merge()->deco;
+    }
+    else if (storage_class & STCconst)
+    {
+        if (!type->isInvariant())
+        {   // Don't use toConst(), as that will do a merge()
+        type = type->makeConst();
+        type->deco = type->merge()->deco;
+        }
+    }
+#else
+    if (storage_class & (STCconst | STCinvariant))
+    {
+        /* Apply const and invariant storage class
+         * to the function's return type
+         */
+        Type *tn = type->nextOf();
+        if (storage_class & STCconst)
+        tn = tn->makeConst();
+        if (storage_class & STCinvariant)
+        tn = tn->makeInvariant();
+        ((TypeNext *)type)->next = tn;
+    }
+
+    type = type->semantic(loc, sc);
+#endif
+    }
-    //type->print();
-    if (type->ty != Tfunction)
@@ -120 +160 @@
-    }
-    f = (TypeFunction *)(type);
+
-    size_t nparams = Argument::dim(f->parameters);
-
@@ -129 +170 @@
-    }
-    protection = sc->protection;
-    storage_class |= sc->stc;
-    //printf("function storage_class = x%x\n", storage_class);
-    Dsymbol *parent = toParent();
-
@@ -138 +177 @@
-    /*if (isAbstract() && !isVirtual())
-    error("non-virtual functions cannot be abstract"); */
+
+    if ((f->isConst() || f->isInvariant()) && !isThis())
+    error("without 'this' cannot be const/invariant");
+
+    if (isAbstract() && isFinal())
+    error("cannot be both final and abstract");
-#if 0
-    if (isAbstract() && fbody)
@@ -682 +727 @@
-#if BREAKABI
-        v_arguments = new VarDeclaration(0, Type::typeinfotypelist->type, Id::_arguments_typeinfo, NULL);
- | STCin
+
-        v_arguments->semantic(sc2);
-        sc2->insert(v_arguments);
-        v_arguments->parent = this;
-
+        //t = Type::typeinfo->type->constOf()->arrayOf();
-        t = Type::typeinfo->type->arrayOf();
-        _arguments = new VarDeclaration(0, t, Id::_arguments, NULL);
@@ -1111 +1157 @@
-        Expression *e1 = new VarExp(0, _arguments);
-        e = new AssignExp(0, e1, e);
+        e->op = TOKconstruct;
-        e = e->semantic(sc);
-        a->push(new ExpStatement(0, e));
@@ -1302 +1349 @@
-    if (type && f->type &&  // can be NULL for overloaded constructors
-    f->type->covariant(type) &&
+    f->type->mod == type->mod &&
-    !isFuncAliasDeclaration())
-    {
@@ -1449 +1497 @@
-{
-    Match *m;
+    Expression *ethis;
-    Expressions *arguments;
-};
@@ -1464 +1513 @@
-    m->anyf = f;
-    tf = (TypeFunction *)f->type;
-
+f->needThis() ? p->ethis : NULL, 
-    //printf("match = %d\n", match);
-    if (match != MATCHnomatch)
@@ -1499 +1548 @@
-}
-
-
+
+
-{
-    Param2 p;
-    p.m = m;
+    p.ethis = ethis;
-    p.arguments = arguments;
-    overloadApply(fstart, &fp2, &p);
@@ -1508 +1559 @@
-
-
-
+ *ethis, Expression
-{
-    TypeFunction *tf;
@@ -1531 +1582 @@
-    m