Changeset 295

Timestamp:

12/15/09 23:46:13 (15 years ago)

Author:

walter

Message:

prefer opApply to range

Files:

• trunk/src/opover.c (modified) (1 diff)
• trunk/src/statement.c (modified) (5 diffs)
• trunk/src/template.c (modified) (1 diff)

trunk/src/opover.c

@@ -578 +578 @@
-        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 *s = search_function(ad,
+            (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();
-        }
-        break;
-        }
-
-    Lapply:
-    {   /* Look for an
-         *  int opApply(int delegate(ref Type [, ...]) dg);
-         * overload
-         */
-        Dsymbol *s = search_function(ad,
-            (op == TOKforeach_reverse) ? Id::applyReverse
-                           : Id::apply);
-        if (s)
-        {
-        FuncDeclaration *fd = s->isFuncDeclaration();
-        if (fd) 
-        {   inferApplyArgTypesX(fd, arguments);
-            break;
-        }
-#if 0
-        TemplateDeclaration *td = s->isTemplateDeclaration();
-        if (td)
-        {   inferApplyArgTypesZ(td, arguments);
-            break;
-        }
-#endif
-        }
-        break;
-    }
-
-    case Tdelegate:
-    {

trunk/src/statement.c

@@ -1290 +1290 @@
-
-    this->func = NULL;
-}
-
-Statement *ForeachStatement::syntaxCopy()
-{
-    Parameters *args = Parameter::arraySyntaxCopy(arguments);
-    Expression *exp = aggr->syntaxCopy();
-    ForeachStatement *s = new ForeachStatement(loc, op, args, exp,
-    body ? body->syntaxCopy() : NULL);
-    return s;
-}
-
-Statement *ForeachStatement::semantic(Scope *sc)
-{
-    //printf("ForeachStatement::semantic() %p\n", this);
-    ScopeDsymbol *sym;
-    Statement *s = this;
-    size_t dim = arguments->dim;
-    TypeAArray *taa = NULL;
+    Dsymbol *sapply = NULL;
-
-    Type *tn = NULL;
-    Type *tnv = NULL;
-
-    func = sc->func;
-    if (func->fes)
-    func = func->fes->func;
-
-    aggr = aggr->semantic(sc);
-    aggr = resolveProperties(sc, aggr);
-    aggr = aggr->optimize(WANTvalue);
-    if (!aggr->type)
-    {
-    error("invalid foreach aggregate %s", aggr->toChars());
-    return this;
-    }
-
-    inferApplyArgTypes(op, arguments, aggr);
-
-    /* Check for inference errors
@@ -1421 +1422 @@
-        st->push(new ExpStatement(loc, de));
-
-        st->push(body->syntaxCopy());
-        s = new CompoundStatement(loc, st);
-        s = new ScopeStatement(loc, s);
-        statements->push(s);
-    }
-
-    s = new UnrolledLoopStatement(loc, statements);
-    s = s->semantic(sc);
-    return s;
-    }
-
-    sym = new ScopeDsymbol();
-    sym->parent = sc->scopesym;
-    sc = sc->push(sym);
-
-    sc->noctor++;
-
-Lagain:
+    Identifier *idapply = (op == TOKforeach_reverse)
+            ? Id::applyReverse : Id::apply;
+    sapply = NULL;
-    switch (tab->ty)
-    {
-    case Tarray:
-    case Tsarray:
-        if (!checkForArgTypes())
-        return this;
-
-        if (dim < 1 || dim > 2)
-        {
-        error("only one or two arguments for array foreach");
-        break;
-        }
-
-        /* Look for special case of parsing char types out of char type
-         * array.
-         */
-        tn = tab->nextOf()->toBasetype();
-        if (tn->ty == Tchar || tn->ty == Twchar || tn->ty == Tdchar)
-        {   Parameter *arg;
-
@@ -1603 +1607 @@
-        if (dim < 1 || dim > 2)
-        {
-        error("only one or two arguments for associative array foreach");
-        break;
-        }
-#if SARRAYVALUE
-        /* This only works if Key or Value is a static array.
-         */
-        tab = taa->getImpl()->type;
-        goto Lagain;
-#else
-        if (op == TOKforeach_reverse)
-        {
-        error("no reverse iteration on associative arrays");
-        }
-        goto Lapply;
-#endif
-    case Tclass:
-    case Tstruct:
-#if DMDV2
+        /* Prefer using opApply, if it exists
+         */
+        if (dim != 1)   // only one argument allowed with ranges
+        goto Lapply;
+
+        sapply = search_function((AggregateDeclaration *)tab->toDsymbol(sc), idapply);
+        if (sapply)
+        goto Lapply;
+
-    {   /* Look for range iteration, i.e. the properties
-         * .empty, .next, .retreat, .head and .rear
-         *    foreach (e; aggr) { ... }
-         * translates to:
-         *    for (auto __r = aggr[]; !__r.empty; __r.next)
-         *    {   auto e = __r.head;
-         *        ...
-         *    }
-         */
-        if (dim != 1)   // only one argument allowed with ranges
-        goto Lapply;
-        AggregateDeclaration *ad = (tab->ty == Tclass)
-            ? (AggregateDeclaration *)((TypeClass  *)tab)->sym
-            : (AggregateDeclaration *)((TypeStruct *)tab)->sym;
-        Identifier *idhead;
-        Identifier *idnext;
-        if (op == TOKforeach)
-        {   idhead = Id::Fhead;
-        idnext = Id::Fnext;
-        }
-        else
-        {   idhead = Id::Ftoe;
-        idnext = Id::Fretreat;
-        }
-        Dsymbol *shead = search_function(ad, idhead);
-        if (!shead)
-        goto Lapply;
-
-        /* Generate a temporary __r and initialize it with the aggregate.
-         */
-        Identifier *id = Identifier::generateId("__r");
@@ -1682 +1693 @@
-        ve->storage_class |= arg->storageClass & (STCin | STCout | STCref | STC_TYPECTOR);
-
-        DeclarationExp *de = new DeclarationExp(loc, ve);
-
-        Statement *body = new CompoundStatement(loc,
-        new DeclarationStatement(loc, de), this->body);
-
-        s = new ForStatement(loc, init, condition, increment, body);
-#if 0
-        printf("init: %s\n", init->toChars());
-        printf("condition: %s\n", condition->toChars());
-        printf("increment: %s\n", increment->toChars());
-        printf("body: %s\n", body->toChars());
-#endif
-        s = s->semantic(sc);
-        break;
-    }
-#endif
-    case Tdelegate:
-    Lapply:
-
-
+
-        Expression *ec;
-        Expression *e;
-        FuncLiteralDeclaration *fld;
-        Parameter *a;
-        Type *t;
-        Expression *flde;
-        Identifier *id;
-        Type *tret;
-
-        if (!checkForArgTypes())
-        {   body = body->semantic(sc);
-        return this;
-        }
-
-
+Type *
-
-        // Need a variable to hold value from any return statements in body.
-        if (!sc->func->vresult && tret && tret != Type::tvoid)
-
-
-
+
+
-        v->noauto = 1;
-        v->semantic(sc);
-        if (!sc->insert(v))
-            assert(0);
-        v->parent = sc->func;
-        sc->func->vresult = v;
-        }
-
-        /* Turn body into the function literal:
-         *  int delegate(ref T arg) { body }
-         */
-
+Parameters *
-        for (size_t i = 0; i < dim; i++)
-        {   Parameter *arg = (Parameter *)arguments->data[i];
+        Identifier *id;
-
-        arg->type = arg->type->semantic(loc, sc);
-        if (arg->storageClass & STCref)
-            id = arg->ident;
-        else
-        {   // Make a copy of the ref argument so it isn't
-            // a reference.
-            VarDeclaration *v;
-            Initializer *ie;
-
-            id = Lexer::uniqueId("__applyArg", i);
-
-
-
+
+
-            s = new DeclarationStatement(0, v);
-            body = new CompoundStatement(loc, s, body);
-        }
-        a = new Parameter(STCref, arg->type, id, NULL);
-        args->push(a);
-        }
-
-
+Type *
+FuncLiteralDeclaration *
-        fld->fbody = body;
-
+Expression *
-        flde = flde->semantic(sc);
-        fld->tookAddressOf = 0;
-
-        // Resolve any forward referenced goto's
-in
+size_
-        {   CompoundStatement *cs = (CompoundStatement *)gotos.data[i];
-        GotoStatement *gs = (GotoStatement *)cs->statements->data[0];
-
-        if (!gs->label->statement)
-        {   // 'Promote' it to this scope, and replace with a return
-            cases.push(gs);
-            s = new ReturnStatement(0, new IntegerExp(cases.dim + 1));
-            cs->statements->data[0] = (void *)s;
-        }
-        }
-
-        if (tab->ty == Taarray)
-        {
-        // Check types
-        Parameter *arg = (Parameter *)arguments->data[0];
-        if (dim == 2)
-        {
-            if (arg->storageClass & STCref)
-            error("foreach: index cannot be ref");
-            if (!arg->type->equals(taa->index))
-            error("foreach: index must be type %s, not %s", taa->index->toChars(), arg->type->toChars());
-            arg = (Parameter *)arguments->data[1];
-        }
-        if (!arg->type->equals(taa->nextOf()))
-            error("foreach: value must be type %s, not %s", taa->nextOf()->toChars(), arg->type->toChars());
-
-        /* Call:
-         *  _aaApply(aggr, keysize, flde)
-         */
+        FuncDeclaration *fdapply;
-        if (dim == 2)
-            fdapply = FuncDeclaration::genCfunc(Type::tindex, "_aaApply2");
-        else
-            fdapply = FuncDeclaration::genCfunc(Type::tindex, "_aaApply");
-        ec = new VarExp(0, fdapply);
-        Expressions *exps = new Expressions();
-        exps->push(aggr);
-        size_t keysize = taa->index->size();
-        keysize = (keysize + (PTRSIZE-1)) & ~(PTRSIZE-1);
-        exps->push(new IntegerExp(0, keysize, Type::tsize_t));
-        exps->push(flde);
-        e = new CallExp(loc, ec, exps);
-        e->type = Type::tindex; // don't run semantic() on e
-        }
-        else if (tab->ty == Tarray || tab->ty == Tsarray)
-        {
-        /* Call:
-         *  _aApply(aggr, flde)
-         */
-        static char fntab[9][3] =
@@ -1821 +1824 @@
-        char fdname[7+1+2+ sizeof(dim)*3 + 1];
-        int flag;
-
-        switch (tn->ty)
-        {
-            case Tchar:     flag = 0; break;
-            case Twchar:    flag = 3; break;
-            case Tdchar:    flag = 6; break;
-            default:        assert(0);
-        }
-        switch (tnv->ty)
-        {
-            case Tchar:     flag += 0; break;
-            case Twchar:    flag += 1; break;
-            case Tdchar:    flag += 2; break;
-            default:        assert(0);
-        }
-        const char *r = (op == TOKforeach_reverse) ? "R" : "";
-        int j = sprintf(fdname, "_aApply%s%.*s%zd", r, 2, fntab[flag], dim);
-        assert(j < sizeof(fdname));
-
+FuncDeclaration *
-
-        ec = new VarExp(0, fdapply);
-        Expressions *exps = new Expressions();
-        if (tab->ty == Tsarray)
-           aggr = aggr->castTo(sc, tn->arrayOf());
-        exps->push(aggr);
-        exps->push(flde);
-        e = new CallExp(loc, ec, exps);
-        e->type = Type::tindex; // don't run semantic() on e
-        }
-        else if (tab->ty == Tdelegate)
-        {
-        /* Call:
-         *  aggr(flde)
-         */
-        Expressions *exps = new Expressions();
-        exps->push(flde);
-        e = new CallExp(loc, aggr, exps);
-        e = e->semantic(sc);
-        if (e->type != Type::tint32)
-            error("opApply() function for %s must return an int", tab->toChars());
-        }
-        else
-        {
-        assert(tab->ty == Tstruct || tab->ty == Tclass);
-        Identifier *idapply = (op == TOKforeach_reverse)
-                ? Id::applyReverse : Id::apply;
-        Dsymbol *sapply = search_function((AggregateDeclaration *)tab->toDsymbol(sc), idapply);
-            Expressions *exps = new Expressions();
+        if (!sapply)
+            sapply = search_function((AggregateDeclaration *)tab->toDsymbol(sc), idapply);
-#if 0
-        TemplateDeclaration *td;
-        if (sapply &&
-            (td = sapply->isTemplateDeclaration()) != NULL)
-        {   /* Call:
-             *  aggr.apply!(fld)()
-             */
-            Objects *tiargs = new Objects();
-            tiargs->push(fld);
-            ec = new DotTemplateInstanceExp(loc, aggr, idapply, tiargs);
-        }
-        else
-#endif
-        {
-            /* Call:
-             *  aggr.apply(flde)
-             */
-            ec = new DotIdExp(loc, aggr, idapply);
-            exps->push(flde);
-        }

trunk/src/template.c

@@ -3736 +3736 @@
-    __except (__ehfilter(GetExceptionInformation()))
-    {
-        global.gag = 0;            // ensure error message gets printed
-        error("recursive expansion");
-        fatal();
-    }
-#endif
-    }
-
-  Laftersemantic:
-    sc2->pop();
-
-    scope->pop();
-
-    // Give additional context info if error occurred during instantiation
-    if (global.errors != errorsave)
-    {
-    error("error instantiating");
-    if (tinst)
-    {   tinst->printInstantiationTrace();
-        fatal();
-    }
-    errors = 1;
-    if (global.gag)
-        tempdecl->instances.remove(tempdecl_instance_idx);
-    }
-
-#if LOG
-    printf("-TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-}
-
-
-void TemplateInstance::semanticTiargs(Scope *sc)
-{
-    //printf("+TemplateInstance::semanticTiargs() %s\n", toChars());
-    if (semantictiargsdone)
-    return;
-    semantictiargsdone = 1;
-    semanticTiargs(loc, sc, tiargs, 0);
-}