Changeset 801

Timestamp:

12/12/10 08:43:49 (14 years ago)

Author:

walter

Message:

improve template arg match

Files:

• branches/dmd-1.x/src/template.c (modified) (9 diffs)
• trunk/src/template.c (modified) (2 diffs)

branches/dmd-1.x/src/template.c

@@ -196 +196 @@
-    }
-    else if (e1)
-    {
-#if 0
-        if (e1 && e2)
-        {
-            printf("match %d\n", e1->equals(e2));
-            e1->print();
-            e2->print();
-            e1->type->print();
-            e2->type->print();
-        }
-#endif
-        if (!e2)
-            goto Lnomatch;
-        if (!e1->equals(e2))
-            goto Lnomatch;
-    }
-    else if (s1)
-    {
-, %p %s\n", s1, s1->toChars(), s2
- || !s1->equals(s2) || s1->parent != s2->parent
+ %s, %p %s %s\n", s1, s1->kind(), s1->toChars(), s2, s2->kind()
+
-        {
-            goto Lnomatch;
-        }
+        if (!s1->equals(s2))
+        {
-#if DMDV2
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                goto Lnomatch;
-        }
-
+
+
+
+
-    }
-    else if (v1)
-    {
-        if (!v2)
-            goto Lnomatch;
-        if (v1->objects.dim != v2->objects.dim)
-            goto Lnomatch;
-        for (size_t i = 0; i < v1->objects.dim; i++)
-        {
-            if (!match((Object *)v1->objects.data[i],
-                       (Object *)v2->objects.data[i],
-                       tempdecl, sc))
-                goto Lnomatch;
-        }
-    }
+Lmatch:
-    //printf("match\n");
-    return 1;   // match
-Lnomatch:
-    //printf("nomatch\n");
-    return 0;   // nomatch;
+}
+
+
+/************************************
+ * Match an array of them.
+ * This should match what genIdent() does.
+ */
+int arrayObjectMatch(Objects *oa1, Objects *oa2, TemplateDeclaration *tempdecl, Scope *sc)
+{
+    if (oa1 == oa2)
+        return 1;
+    if (oa1->dim != oa2->dim)
+        return 0;
+    for (size_t j = 0; j < oa1->dim; j++)
+    {   Object *o1 = (Object *)oa1->data[j];
+        Object *o2 = (Object *)oa2->data[j];
+        if (!match(o1, o2, tempdecl, sc))
+        {
+            return 0;
+        }
+    }
+    return 1;
-}
-
-/****************************************
- */
-
-void ObjectToCBuffer(OutBuffer *buf, HdrGenState *hgs, Object *oarg)
-{
-    //printf("ObjectToCBuffer()\n");
-    Type *t = isType(oarg);
-    Expression *e = isExpression(oarg);
-    Dsymbol *s = isDsymbol(oarg);
-    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);
-    else if (s)
-    {
@@ -332 +365 @@
-                printf("\tparameter[%d] = %s : %s\n", i, tp->ident->toChars(), ttp->specType ? ttp->specType->toChars() : "");
-            }
-        }
-#endif
-    this->loc = loc;
-    this->parameters = parameters;
-    this->origParameters = parameters;
-    this->constraint = constraint;
-    this->members = decldefs;
-    this->overnext = NULL;
-    this->overroot = NULL;
-    this->semanticRun = 0;
-    this->onemember = NULL;
-}
-
-Dsymbol *TemplateDeclaration::syntaxCopy(Dsymbol *)
-{
-    //printf("TemplateDeclaration::syntaxCopy()\n");
-    TemplateDeclaration *td;
-    TemplateParameters *p;
-    Array *d;
-
-    p = NULL;
-    if (parameters)
-    {
-        p = new TemplateParameters();
-        p->setDim(parameters->dim);
-        for (int i = 0; i < p->dim; i++)
-        {   TemplateParameter *tp = (TemplateParameter *)parameters->data[i];
-            p->data[i] = (void *)tp->syntaxCopy();
-        }
-    }
-    Expression *e = NULL;
-    if (constraint)
-        e = constraint->syntaxCopy();
-
+Array *
-    td = new TemplateDeclaration(loc, ident, p, e, d);
-    return td;
-}
-
-void TemplateDeclaration::semantic(Scope *sc)
-{
-#if LOG
-    printf("TemplateDeclaration::semantic(this = %p, id = '%s')\n", this, ident->toChars());
+    printf("sc->stc = %llx\n", sc->stc);
+    printf("sc->module = %s\n", sc->module->toChars());
-#endif
-    if (semanticRun)
-        return;         // semantic() already run
-    semanticRun = 1;
-
-    if (sc->func)
-    {
-#if DMDV1
-        error("cannot declare template at function scope %s", sc->func->toChars());
-#endif
-    }
-
-    if (/*global.params.useArrayBounds &&*/ sc->module)
-    {
-        // Generate this function as it may be used
-        // when template is instantiated in other modules
-        sc->module->toModuleArray();
-    }
-
-    if (/*global.params.useAssert &&*/ sc->module)
@@ -928 +962 @@
-                }
-                declareParameter(paramscope, tp, t);
-                goto L2;
-            }
-            fptupindex = -1;
-        }
-    }
-
-L1:
-    if (nfparams == nfargs)
-        ;
-    else if (nfargs > nfparams)
-    {
-        if (fvarargs == 0)
-            goto Lnomatch;              // too many args, no match
-        match = MATCHconvert;           // match ... with a conversion
-    }
-
-L2:
-#if DMDV2
-    // Match 'ethis' to any TemplateThisParameter's
-    if (ethis)
-    {
+        // Match 'ethis' to any TemplateThisParameter's
-        for (size_t i = 0; i < parameters->dim; i++)
-        {   TemplateParameter *tp = (TemplateParameter *)parameters->data[i];
-            TemplateThisParameter *ttp = tp->isTemplateThisParameter();
-            if (ttp)
-            {   MATCH m;
-
-                Type *t = new TypeIdentifier(0, ttp->ident);
-                m = ethis->type->deduceType(paramscope, t, parameters, &dedtypes);
-                if (!m)
-                    goto Lnomatch;
-                if (m < match)
-                    match = m;          // pick worst match
+            }
+        }
+
+        // Match attributes of ethis against attributes of fd
+        if (fd->type)
+        {
+            Type *tthis = ethis->type;
+            unsigned mod = fd->type->mod;
+            StorageClass stc = scope->stc;
+            if (stc & (STCshared | STCsynchronized))
+                mod |= MODshared;
+            if (stc & STCimmutable)
+                mod |= MODimmutable;
+            if (stc & STCconst)
+                mod |= MODconst;
+            if (stc & STCwild)
+                mod |= MODwild;
+            // Fix mod
+            if (mod & MODimmutable)
+                mod = MODimmutable;
+            if (mod & MODconst)
+                mod &= ~STCwild;
+            if (tthis->mod != mod)
+            {
+                if (!MODimplicitConv(tthis->mod, mod))
+                    goto Lnomatch;
+                if (MATCHconst < match)
+                    match = MATCHconst;
-            }
-        }
-    }
-#endif
-
-    // Loop through the function parameters
-    for (size_t parami = 0; parami < nfparams; parami++)
-    {
-        /* Skip over function parameters which wound up
-         * as part of a template tuple parameter.
-         */
-        if (parami == fptupindex)
-            continue;
-        /* Set i = index into function arguments
-         * Function parameters correspond to function arguments as follows.
-         * Note that tuple_dim may be zero, and there may be default or
-         * variadic arguments at the end.
-         *  arg [0..fptupindex] == param[0..fptupindex]
-         *  arg [fptupindex..fptupindex+tuple_dim] == param[fptupindex]
-         *  arg[fputupindex+dim.. ] == param[fptupindex+1.. ]
@@ -1311 +1373 @@
-    TemplateDeclaration *td_best = NULL;
-    Objects *tdargs = new Objects();
-    TemplateInstance *ti;
-    FuncDeclaration *fd;
-
-#if 0
-    printf("TemplateDeclaration::deduceFunctionTemplate() %s\n", toChars());
-    printf("    targsi:\n");
-    if (targsi)
-    {   for (int i = 0; i < targsi->dim; i++)
-        {   Object *arg = (Object *)targsi->data[i];
-            printf("\t%s\n", arg->toChars());
-        }
-    }
-    printf("    fargs:\n");
-    for (int i = 0; i < fargs->dim; i++)
-    {   Expression *arg = (Expression *)fargs->data[i];
-        printf("\t%s %s\n", arg->type->toChars(), arg->toChars());
-        //printf("\tty = %d\n", arg->type->ty);
-    }
+    printf("stc = %llx\n", scope->stc);
-#endif
-
-    for (TemplateDeclaration *td = this; td; td = td->overnext)
-    {
-        if (!td->semanticRun)
-        {
-            error("forward reference to template %s", td->toChars());
-            goto Lerror;
-        }
-        if (!td->onemember || !td->onemember->toAlias()->isFuncDeclaration())
-        {
-            error("is not a function template");
-            goto Lerror;
-        }
-
-        MATCH m;
-        Objects dedargs;
-
-        m = td->deduceFunctionTemplateMatch(loc, targsi, ethis, fargs, &dedargs);
-        //printf("deduceFunctionTemplateMatch = %d\n", m);
@@ -1605 +1668 @@
-        {
-            dedtypes->data[i] = (void *)this;
-            goto Lexact;
-        }
-        if (equals(at))
-            goto Lexact;
-        else if (ty == Tclass && at->ty == Tclass)
-        {
-            return (MATCH) implicitConvTo(at);
-        }
-        else if (ty == Tsarray && at->ty == Tarray &&
-            nextOf()->equals(at->nextOf()))
-        {
-            goto Lexact;
-        }
-        else
-            goto Lnomatch;
-    }
-
-    if (ty != tparam->ty)
-
-
+
+
+
+
+
+
+
+
-
-    if (nextOf())
-        return nextOf()->deduceType(sc, tparam->nextOf(), parameters, dedtypes);
-
-Lexact:
-    return MATCHexact;
-
-Lnomatch:
-    return MATCHnomatch;
-
-#if DMDV2
-Lconst:
-    return MATCHconst;
-#endif
-}
-
-#if DMDV2
-MATCH TypeDArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
-        Objects *dedtypes)
-{
@@ -1775 +1844 @@
-
-    // Extra check that function characteristics must match
-    if (tparam && tparam->ty == Tfunction)
-    {
-        TypeFunction *tp = (TypeFunction *)tparam;
-        if (varargs != tp->varargs ||
-            linkage != tp->linkage)
-            return MATCHnomatch;
-
-        size_t nfargs = Parameter::dim(this->parameters);
-        size_t nfparams = Parameter::dim(tp->parameters);
-
-        /* See if tuple match
-         */
-        if (nfparams > 0 && nfargs >= nfparams - 1)
-        {
-            /* See if 'A' of the template parameter matches 'A'
-             * of the type of the last function parameter.
-             */
-            Parameter *fparam = Parameter::getNth(tp->parameters, nfparams - 1);
+            assert(fparam);
+            assert(fparam->type);
-            if (fparam->type->ty != Tident)
-                goto L1;
-            TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
-            if (tid->idents.dim)
-                goto L1;
-
-            /* Look through parameters to find tuple matching tid->ident
-             */
-            size_t tupi = 0;
-            for (; 1; tupi++)
-            {   if (tupi == parameters->dim)
-                    goto L1;
-                TemplateParameter *t = (TemplateParameter *)parameters->data[tupi];
-                TemplateTupleParameter *tup = t->isTemplateTupleParameter();
-                if (tup && tup->ident->equals(tid->ident))
-                    break;
-            }
-
-            /* The types of the function arguments [nfparams - 1 .. nfargs]
-             * now form the tuple argument.
@@ -2080 +2151 @@
-                        goto Lnomatch;
-                }
-                else
-                {
-                    dedtypes->data[j] = s1;
-                }
-            }
-            else if (s1 && s2)
-            {
-                if (!s1->equals(s2))
-                    goto Lnomatch;
-            }
-            // BUG: Need to handle tuple parameters
-            else
-                goto Lnomatch;
-        }
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes);
-
-Lnomatch:
+    //printf("no match\n");
-    return MATCHnomatch;
-}
-
-MATCH TypeStruct::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes)
-{
-    //printf("TypeStruct::deduceType()\n");
-    //printf("\tthis->parent   = %s, ", sym->parent->toChars()); print();
-    //printf("\ttparam = %d, ", tparam->ty); tparam->print();
-
-    /* If this struct is a template struct, and we're matching
-     * it against a template instance, convert the struct type
-     * to a template instance, too, and try again.
-     */
-    TemplateInstance *ti = sym->parent->isTemplateInstance();
-
-    if (tparam && tparam->ty == Tinstance)
-    {
-        if (ti && ti->toAlias() == sym)
-        {
-            TypeInstance *t = new TypeInstance(0, ti);
@@ -2438 +2510 @@
-            goto Lnomatch;
-
-        if (specType && !specType->equals(ttp->specType))
-            goto Lnomatch;
-
-        return 1;                       // match
-    }
-
-Lnomatch:
-    return 0;
-}
-
-/*******************************************
- * Match to a particular TemplateParameter.
- * Input:
- *      i               i'th argument
- *      tiargs[]        actual arguments to template instance
- *      parameters[]    template parameters
- *      dedtypes[]      deduced arguments to template instance
- *      *psparam        set to symbol declared and initialized to dedtypes[i]
+ *      flags           1: don't do 'toHeadMutable()'
- */
-
-MATCH TemplateTypeParameter::matchArg(Scope *sc, Objects *tiargs,
-        int i, TemplateParameters *parameters, Objects *dedtypes,
-        Declaration **psparam, int flags)
-{
-    //printf("TemplateTypeParameter::matchArg()\n");
-    Type *t;
-    Object *oarg;
-    MATCH m = MATCHexact;
-    Type *ta;
-
-    if (i < tiargs->dim)
-        oarg = (Object *)tiargs->data[i];
-    else
-    {   // Get default argument instead
-        oarg = defaultArg(loc, sc);
-        if (!oarg)
-        {   assert(i < dedtypes->dim);
-            // It might have already been deduced
@@ -3306 +3379 @@
-            fatal();
-        }
-        return;
-    }
-#if LOG
-    printf("\n+TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-    if (inst)           // if semantic() was already run
-    {
-#if LOG
-        printf("-TemplateInstance::semantic('%s', this=%p) already run\n", inst->toChars(), inst);
-#endif
-        return;
-    }
-
-    // get the enclosing template instance from the scope tinst
-    tinst = sc->tinst;
-
-    if (semanticRun != 0)
-    {
+#if LOG
+        printf("Recursive template expansion\n");
+#endif
-        error(loc, "recursive template expansion");
-//      inst = this;
-        return;
-    }
-    semanticRun = 1;
-
-#if LOG
-    printf("\tdo semantic\n");
-#endif
-    if (havetempdecl)
-    {
-        assert((size_t)tempdecl->scope > 0x10000);
-        // Deduce tdtypes
-        tdtypes.setDim(tempdecl->parameters->dim);
-        if (!tempdecl->matchWithInstance(this, &tdtypes, 0))
-        {
-            error("incompatible arguments for template instantiation");
-            inst = this;
-            return;
-        }

trunk/src/template.c

@@ -197 +197 @@
-    }
-    else if (e1)
-    {
-#if 0
-        if (e1 && e2)
-        {
-            printf("match %d\n", e1->equals(e2));
-            e1->print();
-            e2->print();
-            e1->type->print();
-            e2->type->print();
-        }
-#endif
-        if (!e2)
-            goto Lnomatch;
-        if (!e1->equals(e2))
-            goto Lnomatch;
-    }
-    else if (s1)
-    {
-        //printf("%p %s, %p %s\n", s1, s1->toChars(), s2, s2->toChars());
-        if (!s2 || !s1->equals(s2) || s1->parent != s2->parent)
-        {
+            if (s2)
+            {
+                VarDeclaration *v1 = s1->isVarDeclaration();
+                VarDeclaration *v2 = s2->isVarDeclaration();
+                if (v1 && v2 && v1->storage_class & v2->storage_class & STCmanifest)
+                {   ExpInitializer *ei1 = v1->init->isExpInitializer();
+                    ExpInitializer *ei2 = v2->init->isExpInitializer();
+                    if (ei1 && ei2 && ei1->exp->equals(ei2->exp))
+                        goto Lmatch;
+                }
+            }
-            goto Lnomatch;
-        }
-#if DMDV2
-        VarDeclaration *v1 = s1->isVarDeclaration();
-        VarDeclaration *v2 = s2->isVarDeclaration();
-        if (v1 && v2 && v1->storage_class & v2->storage_class & STCmanifest)
-        {   ExpInitializer *ei1 = v1->init->isExpInitializer();
-            ExpInitializer *ei2 = v2->init->isExpInitializer();
-            if (ei1 && ei2 && !ei1->exp->equals(ei2->exp))
-                goto Lnomatch;
-        }
-#endif
-    }
-    else if (v1)
-    {
-        if (!v2)
-            goto Lnomatch;
-        if (v1->objects.dim != v2->objects.dim)
-            goto Lnomatch;
-        for (size_t i = 0; i < v1->objects.dim; i++)
-        {
-            if (!match((Object *)v1->objects.data[i],
-                       (Object *)v2->objects.data[i],
-                       tempdecl, sc))
-                goto Lnomatch;
-        }
-    }
+Lmatch:
-    //printf("match\n");
-    return 1;   // match
-Lnomatch:
-    //printf("nomatch\n");
-    return 0;   // nomatch;
-}
-
-
-/************************************
- * Match an array of them.
- */
-int arrayObjectMatch(Objects *oa1, Objects *oa2, TemplateDeclaration *tempdecl, Scope *sc)
-{
-    if (oa1 == oa2)
-        return 1;
-    if (oa1->dim != oa2->dim)
-        return 0;
-    for (size_t j = 0; j < oa1->dim; j++)
-    {   Object *o1 = (Object *)oa1->data[j];
-        Object *o2 = (Object *)oa2->data[j];
@@ -4686 +4697 @@
-            /* Bugzilla 3043: if the first character of p is a digit this
-             * causes ambiguity issues because the digits of the two numbers are adjacent.
-             * Current demanglers resolve this by trying various places to separate the
-             * numbers until one gets a successful demangle.
-             * Unfortunately, fixing this ambiguity will break existing binary
-             * compatibility and the demanglers, so we'll leave it as is.
-             */
-            buf.printf("%zu%s", strlen(p), p);
-        }
-        else if (va)
-        {
-            assert(i + 1 == args->dim);         // must be last one
-            args = &va->objects;
-            i = -1;
-        }
-        else
-            assert(0);
-    }
-    buf.writeByte('Z');
-    id = buf.toChars();
-buf.data = NULL;
+//buf.data = NULL;                          // we can free the string after call to idPool()
-    //printf("\tgenIdent = %s\n", id);
-new Identifier(id, TOKidentifier
+Lexer::idPool(id
-}
-
-
-/****************************************************
- * Declare parameters of template instance, initialize them with the
- * template instance arguments.
- */
-
-void TemplateInstance::declareParameters(Scope *sc)
-{
-    //printf("TemplateInstance::declareParameters()\n");
-    for (int i = 0; i < tdtypes.dim; i++)
-    {
-        TemplateParameter *tp = (TemplateParameter *)tempdecl->parameters->data[i];
-        //Object *o = (Object *)tiargs->data[i];
-        Object *o = (Object *)tdtypes.data[i];          // initializer for tp
-
-        //printf("\ttdtypes[%d] = %p\n", i, o);
-        tempdecl->declareParameter(sc, tp, o);
-    }