Changeset 837

Timestamp:

11/17/07 17:25:07 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 2.006

Files:

• branches/dmdfe-2.0/cast.c (modified) (5 diffs)
• branches/dmdfe-2.0/class.c (modified) (1 diff)
• branches/dmdfe-2.0/declaration.c (modified) (3 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (2 diffs)
• branches/dmdfe-2.0/dsymbol.c (modified) (15 diffs)
• branches/dmdfe-2.0/dsymbol.h (modified) (4 diffs)
• branches/dmdfe-2.0/expression.c (modified) (20 diffs)
• branches/dmdfe-2.0/expression.h (modified) (4 diffs)
• branches/dmdfe-2.0/func.c (modified) (3 diffs)
• branches/dmdfe-2.0/lexer.c (modified) (1 diff)
• branches/dmdfe-2.0/lexer.h (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (2 diffs)
• branches/dmdfe-2.0/mtype.c (modified) (9 diffs)
• branches/dmdfe-2.0/template.c (modified) (12 diffs)
• branches/dmdfe-2.0/template.h (modified) (2 diffs)
• branches/dmdfe-2.0/typinf.c (modified) (1 diff)

branches/dmdfe-2.0/cast.c

@@ -484 +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 &&
@@ -497 +517 @@
-         */
-        assert(0);
-
-
+VarExp *
+FuncDeclaration *
-        if (f && f->overloadExactMatch(t->nextOf()))
-        result = MATCHexact;
@@ -929 +949 @@
-    {
-    // Look for pointers to functions where the functions are overloaded.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (type->ty == Tpointer && type->nextOf()->ty == Tfunction &&
@@ -936 +981 @@
-        e1->op == TOKvar)
-    {
-
-
+VarExp *
+FuncDeclaration *
-        if (f)
-        {
+        assert(0);  // should be SymOffExp instead
-        f = f->overloadExactMatch(tb->nextOf());
-        if (f)
@@ -1272 +1318 @@
-    if ((t1->ty == Tsarray || t1->ty == Tarray) &&
-        (t2->ty == Tsarray || t2->ty == Tarray) &&
-
+
+
+
-    {
-        t1 = t1->constOf();

branches/dmdfe-2.0/class.c

@@ -817 +817 @@
-    return 0;
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-#endif

branches/dmdfe-2.0/declaration.c

@@ -446 +446 @@
-    {
-    // Try to convert Expression to Dsymbol
-
-{   s = ((VarExp *)e)->var;
+
+if (s)
-        goto L2;
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-    else if (t)
@@ -651 +645 @@
-    //printf("VarDeclaration::semantic('%s', parent = '%s')\n", toChars(), sc->parent->toChars());
-    //printf(" type = %s\n", type->toChars());
+    //printf("stc = x%x\n", sc->stc);
-    //printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
@@ -748 +743 @@
-    }
-
+Lagain:
-    if (isConst())
-    {
+    /* Rewrite things like:
+     *  const string s;
+     * to:
+     *  invariant string s;
+     */
+    if (type->nextOf() && type->nextOf()->isInvariant())
+    {   storage_class |= STCinvariant;
+        storage_class &= ~STCconst;
+        goto Lagain;
+    }
-    type = type->constOf();
-    if (isParameter())

branches/dmdfe-2.0/declaration.h

@@ -461 +461 @@
-    int overloadInsert(Dsymbol *s);
-    FuncDeclaration *overloadExactMatch(Type *t);
-
+, int flags = 0
-    LabelDsymbol *searchLabel(Identifier *ident);
-    AggregateDeclaration *isThis();
@@ -476 +476 @@
-    int isAbstract();
-    int isCodeseg();
+    int isOverloadable();
-    virtual int isNested();
-    int needThis();

branches/dmdfe-2.0/dsymbol.c

@@ -383 +383 @@
-}
-
+int Dsymbol::isOverloadable()
+{
+    return 0;
+}
+
-LabelDsymbol *Dsymbol::isLabel()        // is this a LabelDsymbol()?
-{
@@ -581 +586 @@
-    }
-#endif
+}
+
+/********************************* OverloadSet ****************************/
+
+OverloadSet::OverloadSet()
+    : Dsymbol()
+{
+}
+
+void OverloadSet::push(Dsymbol *s)
+{
+    a.push(s);
+}
+
+char *OverloadSet::kind()
+{
+    return "overloadset";
-}
-
@@ -618 +640 @@
-
-Dsymbol *ScopeDsymbol::search(Loc loc, Identifier *ident, int flags)
-
-
-
+
-    //printf("%s->ScopeDsymbol::search(ident='%s', flags=x%x)\n", toChars(), ident->toChars(), flags);
+
-    // Look in symbols declared in this module
-
+Dsymbol *
-    if (s)
-    {
@@ -630 +651 @@
-    else if (imports)
-    {
+    OverloadSet *a = NULL;
+
-    // Look in imported modules
-
+nt i
-    {   ScopeDsymbol *ss = (ScopeDsymbol *)imports->data[i];
-        Dsymbol *s2;
@@ -640 +663 @@
-
-        //printf("\tscanning import '%s', prots = %d, isModule = %p, isImport = %p\n", ss->toChars(), prots[i], ss->isModule(), ss->isImport());
+        /* Don't find private members if ss is a module
+         */
-        s2 = ss->search(loc, ident, ss->isModule() ? 1 : 0);
-        if (!s)
@@ -647 +672 @@
-        if (s->toAlias() == s2->toAlias())
-        {
+            /* After following aliases, we found the same symbol,
+             * so it's not an ambiguity.
+             * But if one alias is deprecated, prefer the other.
+             */
-            if (s->isDeprecated())
-            s = s2;
@@ -665 +694 @@
-               )
-            {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return NULL;
-            if (!(flags & 2))
@@ -674 +724 @@
-        }
-    }
+
+    /* Build special symbol if we had multiple finds
+     */
+    if (a)
+    {   assert(s);
+        a->push(s);
+        s = a;
+    }
+
-    if (s)
-    {
-        Declaration *d = s->isDeclaration();
-
+
+
-        !(flags & 2))
-        error("%s is private", d->toPrettyChars());
@@ -832 +892 @@
-/****************************** ArrayScopeSymbol ******************************/
-
-
+Scope *sc, 
-    : ScopeDsymbol()
-{
@@ -839 +899 @@
-    type = NULL;
-    td = NULL;
-
-
-
+
+
+
+
-    : ScopeDsymbol()
-{
@@ -847 +908 @@
-    type = t;
-    td = NULL;
-
-
-
+
+
+
+
-    : ScopeDsymbol()
-{
@@ -855 +917 @@
-    type = NULL;
-    td = s;
+    this->sc = sc;
-}
-
@@ -872 +935 @@
-        v->init = new ExpInitializer(0, e);
-        v->storage_class |= STCconst;
+        v->semantic(sc);
-        return v;
-    }
@@ -881 +945 @@
-        v->init = new ExpInitializer(0, e);
-        v->storage_class |= STCconst;
+        v->semantic(sc);
-        return v;
-    }
@@ -945 +1010 @@
-        *pvar = v;
-    }
+    (*pvar)->semantic(sc);
-    return (*pvar);
-    }

branches/dmdfe-2.0/dsymbol.h

@@ -67 +67 @@
-struct DeleteDeclaration;
-struct HdrGenState;
+struct OverloadSet;
-
-#if IN_GCC
@@ -141 +142 @@
-    virtual ClassDeclaration *isClassMember();  // are we a member of a class?
-    virtual int isExport();         // is Dsymbol exported?
-   
+
-    virtual int isDeprecated();         // is Dsymbol deprecated?
+    virtual int isOverloadable();
-    virtual LabelDsymbol *isLabel();        // is this a LabelDsymbol?
-    virtual AggregateDeclaration *isMember();   // is this symbol a member of an AggregateDeclaration?
@@ -204 +206 @@
-    virtual SymbolDeclaration *isSymbolDeclaration() { return NULL; }
-    virtual AttribDeclaration *isAttribDeclaration() { return NULL; }
+    virtual OverloadSet *isOverloadSet() { return NULL; }
-};
-
@@ -256 +259 @@
-    TypeTuple *type;    // for tuple[length]
-    TupleDeclaration *td;   // for tuples of objects
-
-
-
-
+
+
+
+
+
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-
-    ArrayScopeSymbol *isArrayScopeSymbol() { return this; }
+};
+
+// Overload Sets
+
+struct OverloadSet : Dsymbol
+{
+    Dsymbols a;     // array of Dsymbols
+
+    OverloadSet();
+    void push(Dsymbol *s);
+    OverloadSet *isOverloadSet() { return this; }
+    char *kind();
-};
-

branches/dmdfe-2.0/expression.c

@@ -254 +254 @@
-    Type *t = e->type->toBasetype();
-
-
+ || e->op == TOKoverloadset
-    {
-        e = new CallExp(e->loc, e);
@@ -276 +276 @@
-        e->error("expression has no value");
-    }
+    
-    }
-    return e;
@@ -711 +712 @@
-{
-#if LOGSEMANTIC
-\n"
+ %s\n", toChars()
-#endif
-    if (type)
@@ -1026 +1027 @@
-    if (type && !type->isscalar())
-    {
-test1: 
+
-    error("integral constant must be scalar type, not %s", type->toChars());
-    type = Type::terror;
@@ -1630 +1631 @@
-    WithScopeSymbol *withsym;
-
-
+
+
-    withsym = scopesym->isWithScopeSymbol();
-    if (withsym)
@@ -1651 +1653 @@
-    else
-    {
-
-
-
-
-
-
-
+
+
+
-        FuncDeclaration *f = s->isFuncDeclaration();
-        if (f && f->parent)
@@ -1677 +1675 @@
-        }
-        }
-
-
-
-
-
-
-
-
-
+
+
-    }
-    return e->semantic(sc);
@@ -1728 +1719 @@
-/******************************** DsymbolExp **************************/
-
-
+, int hasOverloads
-    : Expression(loc, TOKdsymbol, sizeof(DsymbolExp))
-{
-    this->s = s;
+    this->hasOverloads = hasOverloads;
-}
-
@@ -1746 +1738 @@
-    FuncDeclaration *f;
-    FuncLiteralDeclaration *fld;
+    OverloadSet *o;
-    Declaration *d;
-    ClassDeclaration *cd;
@@ -1800 +1793 @@
-        }
-    }
-#if 0
-    if ((v->isConst() || v->isInvariant()) && type->toBasetype()->ty != Tsarray)
-    {   // Replace v with its initializer
-        if (v->init)
-        {
-        if (v->inuse)
-        {
-            error("circular reference to '%s'", v->toChars());
-            type = Type::tint32;
-            return this;
-        }
-        ExpInitializer *ei = v->init->isExpInitializer();
-        if (ei)
-        {
-            e = ei->exp->copy();    // make copy so we can change loc
-            if (e->op == TOKstring || !e->type)
-            e = e->semantic(sc);
-            e = e->implicitCastTo(sc, type);
-            e->loc = loc;
-            return e;
-        }
-        }
-        else
-        {
-        e = type->defaultInit();
-        e->loc = loc;
-        return e;
-        }
-    }
-#endif
-    e = new VarExp(loc, v);
-    e->type = type;
@@ -1844 +1807 @@
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
-
+
+
+
+
+
+
-    }
-    cd = s->isClassDeclaration();
@@ -3646 +3614 @@
-
-
+/******************************** OverExp **************************/
+
+OverExp::OverExp(OverloadSet *s)
+    : Expression(loc, TOKoverloadset, sizeof(OverExp))
+{
+    //printf("OverExp(this = %p, '%s')\n", this, var->toChars());
+    vars = s;
+    type = Type::tvoid;
+}
+
+Expression *OverExp::toLvalue(Scope *sc, Expression *e)
+{
+    return this;
+}
+
+
-/******************************** TupleExp **************************/
-
@@ -5823 +5807 @@
-    }
-    }
+    else if (e1->op == TOKoverloadset)
+    {
+    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();
+        if (f2)
+        {
+        f2 = f2->overloadResolve(loc, arguments, 1);
+        }
+        else
+        {   TemplateDeclaration *td = s->isTemplateDeclaration();
+        assert(td);
+        f2 = td->deduce(sc, loc, NULL, arguments, 1);
+        }
+        if (f2)
+        {   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;
+        }
+    }
+    if (!f)
+    {   /* No overload matches, just set f and rely on error
+         * message being generated later.
+         */
+        f = (FuncDeclaration *)eo->vars->a.data[0];
+    }
+    e1 = new VarExp(loc, f);
+    goto Lagain;
+    }
-    else if (!t1)
-    {
@@ -5878 +5897 @@
-    f = ve->var->isFuncDeclaration();
-    assert(f);
-
-    // Look to see if f is really a function template
-    if (0 && !istemp && f->parent)
-    {   TemplateInstance *ti = f->parent->isTemplateInstance();
-
-        if (ti &&
-        (ti->name == f->ident ||
-         ti->toAlias()->ident == f->ident)
-        &&
-        ti->tempdecl)
-        {
-        /* This is so that one can refer to the enclosing
-         * template, even if it has the same name as a member
-         * of the template, if it has a !(arguments)
-         */
-        TemplateDeclaration *tempdecl = ti->tempdecl;
-        if (tempdecl->overroot)         // if not start of overloaded list of TemplateDeclaration's
-            tempdecl = tempdecl->overroot; // then get the start
-        e1 = new TemplateExp(loc, tempdecl);
-        istemp = 1;
-        goto Lagain;
-        }
-    }
-
-    if (ve->hasOverloads)
@@ -6557 +6553 @@
-    if (t->ty == Tsarray || t->ty == Tarray || t->ty == Ttuple)
-    {
-
+sc, 
-    sym->loc = loc;
-    sym->parent = sc->scopesym;
@@ -6631 +6627 @@
-    }
-
-((TypeNext *)t)->next
+t->nextOf()
-    return e;
-
@@ -6897 +6893 @@
-    if (t1->ty == Tsarray || t1->ty == Tarray || t1->ty == Ttuple)
-    {   // Create scope for 'length' variable
-
+sc, 
-    sym->loc = loc;
-    sym->parent = sc->scopesym;
@@ -7082 +7078 @@
-
-#if LOGSEMANTIC
-
+//
-#endif
-    //printf("e1->op = %d, '%s'\n", e1->op, Token::toChars(e1->op));
+    //printf("e2->op = %d, '%s'\n", e2->op, Token::toChars(e2->op));
-
-    /* Look for operator overloading of a[i]=value.
@@ -7178 +7175 @@
-    e2 = resolveProperties(sc, e2);
-    assert(e1->type);
+
+    /* Rewrite tuple assignment as a tuple of assignments.
+     */
+    if (e1->op == TOKtuple && e2->op == TOKtuple)
+    {   TupleExp *tup1 = (TupleExp *)e1;
+    TupleExp *tup2 = (TupleExp *)e2;
+    size_t dim = tup1->exps->dim;
+    if (dim != tup2->exps->dim)
+    {
+        error("mismatched tuple lengths, %d and %d", (int)dim, (int)tup2->exps->dim);
+    }
+    else
+    {   Expressions *exps = new Expressions;
+        exps->setDim(dim);
+
+        for (int i = 0; i < dim; i++)
+        {   Expression *ex1 = (Expression *)tup1->exps->data[i];
+        Expression *ex2 = (Expression *)tup2->exps->data[i];
+        exps->data[i] = (void *) new AssignExp(loc, ex1, ex2);
+        }
+        Expression *e = new TupleExp(loc, exps);
+        e = e->semantic(sc);
+        return e;
+    }
+    }
-
-    t1 = e1->type->toBasetype();
@@ -7924 +7946 @@
-
-    typeCombine(sc);
+//type->print();
-    type = type->mutableOf();
+//printf("test1\n");
+//type->print();
-
-    Type *tb = type->toBasetype();
-    if (tb->ty == Tsarray)
-        type = tb->nextOf()->arrayOf();
-
+
+
+
-        type = type->nextOf()->toCanonConst()->arrayOf();
+//printf("test3\n");
+//type->print();
-#if 0
-    e1->type->print();

branches/dmdfe-2.0/expression.h

@@ -44 +44 @@
-struct InterState;
-struct Symbol;      // back end symbol
+struct OverloadSet;
-
-enum TOK;
@@ -231 +232 @@
-{
-    Dsymbol *s;
-
-
+
+
+
-    Expression *semantic(Scope *sc);
-    char *toChars();
@@ -326 +328 @@
-    Expression *interpret(InterState *istate);
-    Expression *castTo(Scope *sc, Type *t);
+    elem *toElem(IRState *irs);
-
-    int inlineCost(InlineCostState *ics);
@@ -537 +540 @@
-    //Expression *inlineScan(InlineScanState *iss);
-};
+
+// Overload Set
+
+struct OverExp : Expression
+{
+    OverloadSet *vars;
+
+    OverExp(OverloadSet *s);
+    Expression *toLvalue(Scope *sc, Expression *e);
+};
+
-
-// Function/Delegate literal

branches/dmdfe-2.0/func.c

@@ -1504 +1504 @@
-
-
-
+, int flags
-{
-    TypeFunction *tf;
@@ -1546 +1546 @@
-    if (m.last == MATCHnomatch)
-    {
+        if (flags & 1)      // if do not print error messages
+        return NULL;        // no match
+
-        tf = (TypeFunction *)type;
-
@@ -1774 +1777 @@
-}
-
+int FuncDeclaration::isOverloadable()
+{
+    return 1;           // functions can be overloaded
+}
+
-// Determine if function needs
-// a static frame pointer to its lexically enclosing function

branches/dmdfe-2.0/lexer.c

@@ -2887 +2887 @@
-#if V2
-    {   "__traits", TOKtraits   },
+    {   "__overloadset", TOKoverloadset },
-#endif
-};

branches/dmdfe-2.0/lexer.h

@@ -153 +153 @@
-#if V2
-    TOKtraits,
+    TOKoverloadset,
-#endif
-

branches/dmdfe-2.0/mars.c

@@ -56 +56 @@
-    copyright = "Copyright (c) 1999-2007 by Digital Mars";
-    written = "written by Walter Bright";
-5
+6
-    global.structalign = 8;
-
@@ -110 +110 @@
-    fprintf(stdmsg, "\n");
-    fflush(stdmsg);
-//
+
-    }
-    global.errors++;

branches/dmdfe-2.0/mtype.c

@@ -370 +370 @@
-    if (ty == Tsarray)
-    {   TypeSArray *ta = (TypeSArray *)t;
-
+//
-    }
-    t = t->merge();
@@ -1858 +1858 @@
-{
-    if (t->ty == Ttuple)
-
+sc, 
-    sym->parent = sc->scopesym;
-    sc = sc->push(sym);
@@ -1873 +1873 @@
-Expression *semanticLength(Scope *sc, TupleDeclaration *s, Expression *exp)
-{
-
+c, s
-    sym->parent = sc->scopesym;
-    sc = sc->push(sym);
@@ -1899 +1899 @@
-    if (td)
-    {
-
+sc, 
-        sym->parent = sc->scopesym;
-        sc = sc->push(sym);
@@ -2441 +2441 @@
-    index = index->semantic(loc,sc);
-
-
+
+
+
+
-
-    switch (index->toBasetype()->ty)
@@ -3052 +3055 @@
-
-        if (arg->storageClass & STCconst)
-
+
+
+
+
+
-        else if (arg->storageClass & STCinvariant)
-        arg->type = arg->type->invariantOf();
@@ -4466 +4473 @@
-    return;
-    }
-
+
+
+
+
+
-}
-
@@ -5321 +5332 @@
-        /* It's a slice of a TupleDeclaration
-         */
-
+sc, 
-        sym->parent = sc->scopesym;
-        sc = sc->push(sym);
@@ -5468 +5479 @@
-        buf->writestring((global.params.Dversion == 1)
-            ? (char *)"inout " : (char *)"ref ");
+        else if (arg->storageClass & STCin)
+        buf->writestring("in ");
-        else if (arg->storageClass & STClazy)
-        buf->writestring("lazy ");
+        if (arg->storageClass & STCconst)
+        buf->writestring("const ");
+        if (arg->storageClass & STCinvariant)
+        buf->writestring("invariant ");
-        argbuf.reset();
-        arg->type->toCBuffer(&argbuf, arg->ident, hgs);

branches/dmdfe-2.0/template.c

@@ -204 +204 @@
-void ObjectToCBuffer(OutBuffer *buf, HdrGenState *hgs, Object *oarg)
-{
+    //printf("ObjectToCBuffer()\n");
-    Type *t = isType(oarg);
-    Expression *e = isExpression(oarg);
@@ -209 +210 @@
-    Tuple *v = isTuple(oarg);
-    if (t)
+    {   //printf("\tt: %s ty = %d\n", t->toChars(), t->ty);
-    t->toCBuffer(buf, NULL, hgs);
+    }
-    else if (e)
-    e->toCBuffer(buf, hgs);
@@ -474 +477 @@
-    //printf("\targument [%d]\n", i);
-#if 0
-
+//
-    TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
-    if (ttp)
@@ -950 +953 @@
-}
-
+/***********************************
+ * We can overload templates.
+ */
+
+int TemplateDeclaration::isOverloadable()
+{
+    return 1;
+}
+
-/*************************************************
- * Given function arguments, figure out which template function
@@ -957 +969 @@
- *  targsi      initial list of template arguments
- *  fargs       arguments to function
+ *  flags       1: do not issue error message on no match, just return NULL
- */
-
-FuncDeclaration *TemplateDeclaration::deduce(Scope *sc, Loc loc,
-
+, int flags
-{
-    MATCH m_best = MATCHnomatch;
@@ -1045 +1058 @@
-    if (!td_best)
-    {
-
+