Changeset 586

Timestamp:

07/24/10 23:23:26 (14 years ago)

Author:

walter

Message:

bugzilla 3560 foreach over nested function generates wrong code

Files:

• branches/dmd-1.x/src/statement.c (modified) (1 diff)
• trunk/src/statement.c (modified) (1 diff)

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

@@ -1812 +1812 @@
-                int j = sprintf(fdname, "_aApply%s%.*s%zd", r, 2, fntab[flag], dim);
-                assert(j < sizeof(fdname));
-                FuncDeclaration *fdapply = FuncDeclaration::genCfunc(Type::tindex, fdname);
-
-                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 = e->semantic(sc);
-                if (e->type != Type::tint32)
-                    error("opApply() function for %s must return an int", tab->toChars());
-            }
-            else
-            {
-                /* Call:
-                 *      aggr.apply(flde)
-                 */
-                ec = new DotIdExp(loc, aggr,
-                        (op == TOKforeach_reverse) ? Id::applyReverse
-                                                   : Id::apply);
-                Expressions *exps = new Expressions();
-                exps->push(flde);
-                e = new CallExp(loc, ec, exps);
-                e = e->semantic(sc);
-                if (e->type != Type::tint32)
-                    error("opApply() function for %s must return an int", tab->toChars());
-            }
-

trunk/src/statement.c

@@ -1878 +1878 @@
-                int j = sprintf(fdname, "_aApply%s%.*s%zd", r, 2, fntab[flag], dim);
-                assert(j < sizeof(fdname));
-                FuncDeclaration *fdapply = FuncDeclaration::genCfunc(Type::tindex, fdname);
-
-                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 = 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);
-                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);