Changeset 307

Timestamp:

12/24/09 09:38:16 (15 years ago)

Author:

walter

Message:

bugzilla 3641 alias shared T U does not work

Files:

• trunk/src/declaration.c (modified) (2 diffs)
• trunk/src/opover.c (modified) (2 diffs)

trunk/src/declaration.c

@@ -290 +290 @@
-        st->htype = htype->syntaxCopy();
-    if (!hbasetype)
-    {   if (basetype)
-    {   hbasetype = basetype->syntaxCopy();
-        st->hbasetype = basetype->syntaxCopy();
-    }
-    }
-    else
-        st->hbasetype = hbasetype->syntaxCopy();
-#endif
-    return st;
-}
-
-void TypedefDeclaration::semantic(Scope *sc)
-{
-    //printf("TypedefDeclaration::semantic(%s) sem = %d\n", toChars(), sem);
-    if (sem == 0)
-    {   sem = 1;
-    basetype = basetype->semantic(loc, sc);
-    sem = 2;
+#if DMDV2
+    type = type->addStorageClass(storage_class);
+#endif
-    type = type->semantic(loc, sc);
-    if (sc->parent->isFuncDeclaration() && init)
-        semantic2(sc);
-    storage_class |= sc->stc & STCdeprecated;
-    }
-    else if (sem == 1)
-    {
-    error("circular definition");
-    }
-}
-
-void TypedefDeclaration::semantic2(Scope *sc)
-{
-    //printf("TypedefDeclaration::semantic2(%s) sem = %d\n", toChars(), sem);
-    if (sem == 2)
-    {   sem = 3;
-    if (init)
-    {
-        init = init->semantic(sc, basetype);
-
@@ -421 +424 @@
-        sa->haliassym = aliassym->syntaxCopy(s);
-    }
-    }
-    else
-    sa->haliassym = haliassym->syntaxCopy(s);
-#endif
-    return sa;
-}
-
-void AliasDeclaration::semantic(Scope *sc)
-{
-    //printf("AliasDeclaration::semantic() %s\n", toChars());
-    if (aliassym)
-    {
-    if (aliassym->isTemplateInstance())
-        aliassym->semantic(sc);
-    return;
-    }
-    this->inSemantic = 1;
-
+#if DMDV1   // don't really know why this is here
-    if (storage_class & STCconst)
-    error("cannot be const");
+#endif
-
-    storage_class |= sc->stc & STCdeprecated;
-
-    // Given:
-    //  alias foo.bar.abc def;
-    // it is not knowable from the syntax whether this is an alias
-    // for a type or an alias for a symbol. It is up to the semantic()
-    // pass to distinguish.
-    // If it is a type, then type is set and getType() will return that
-    // type. If it is a symbol, then aliassym is set and type is NULL -
-    // toAlias() will return aliasssym.
-
-    Dsymbol *s;
-    Type *t;
-    Expression *e;
-
-    /* This section is needed because resolve() will:
-     *   const x = 3;
-     *   alias x y;
-     * try to alias y to 3.
-     */
-    s = type->toDsymbol(sc);
-    if (s && ((s->getType() && type->equals(s->getType())) || s->isEnumMember()))
-    goto L2;            // it's a symbolic alias
-
-#if DMDV2
+    type = type->addStorageClass(storage_class);
-    if (storage_class & (STCref | STCnothrow | STCpure))
-    {   // For 'ref' to be attached to function types, and picked
-    // up by Type::resolve(), it has to go into sc.
-    sc = sc->push();
-
+ | STCshared
-    type->resolve(loc, sc, &e, &t, &s);
-    sc = sc->pop();
-    }
-    else
-#endif
-    type->resolve(loc, sc, &e, &t, &s);
-    if (s)
-    {
-    goto L2;
-    }
-    else if (e)
-    {
-    // Try to convert Expression to Dsymbol
-    s = getDsymbol(e);
-    if (s)
-        goto L2;
-
-    error("cannot alias an expression %s", e->toChars());
-    t = e->type;
-    }

trunk/src/opover.c

@@ -533 +533 @@
- * Given array of arguments and an aggregate type,
- * if any of the argument types are missing, attempt to infer
- * them from the aggregate type.
- */
-
-void inferApplyArgTypes(enum TOK op, Parameters *arguments, Expression *aggr)
-{
-    if (!arguments || !arguments->dim)
-    return;
-
-    /* Return if no arguments need types.
-     */
-    for (size_t u = 0; 1; u++)
-    {   if (u == arguments->dim)
-        return;
-    Parameter *arg = (Parameter *)arguments->data[u];
-    if (!arg->type)
-        break;
-    }
-
+    Dsymbol *s;
-    AggregateDeclaration *ad;
-
-    Parameter *arg = (Parameter *)arguments->data[0];
-    Type *taggr = aggr->type;
-    if (!taggr)
-    return;
-    Type *tab = taggr->toBasetype();
-    switch (tab->ty)
-    {
-    case Tarray:
-    case Tsarray:
-    case Ttuple:
-        if (arguments->dim == 2)
-        {
-        if (!arg->type)
-            arg->type = Type::tsize_t;  // key type
-        arg = (Parameter *)arguments->data[1];
-        }
-        if (!arg->type && tab->ty != Ttuple)
-        arg->type = tab->nextOf();  // value type
@@ -578 +579 @@
-        if (arguments->dim == 2)
-        {
-        if (!arg->type)
-            arg->type = taa->index; // key type
-        arg = (Parameter *)arguments->data[1];
-        }
-        if (!arg->type)
-        arg->type = taa->next;      // value type
-        break;
-    }
-
-    case Tclass:
-        ad = ((TypeClass *)tab)->sym;
-        goto Laggr;
-
-    case Tstruct:
-        ad = ((TypeStruct *)tab)->sym;
-        goto Laggr;
-
-    Laggr:
-Dsymbol *
+
-            (op == TOKforeach_reverse) ? Id::applyReverse
-                           : Id::apply);
-        if (s)
-        goto Lapply;            // prefer opApply
-
-        if (arguments->dim == 1)
-        {
-        if (!arg->type)
-        {
-            /* Look for a head() or rear() overload
-             */
-            Identifier *id = (op == TOKforeach) ? Id::Fhead : Id::Ftoe;
-            Dsymbol *s = search_function(ad, id);
-            FuncDeclaration *fd = s ? s->isFuncDeclaration() : NULL;
-            if (!fd)
-            {   if (s && s->isTemplateDeclaration())
-                break;
-            goto Lapply;
-            }
-            arg->type = fd->type->nextOf();