Changeset 779

Timestamp:

12/05/10 07:48:25 (14 years ago)

Author:

walter

Message:

bugzilla 5182 ICE(expression.c): calling unittest from a function

Files:

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

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

@@ -2141 +2141 @@
-                return e;
-            }
-        }
-        e = new VarExp(loc, v);
-        e->type = type;
-        e = e->semantic(sc);
-        return e->deref();
-    }
-    fld = s->isFuncLiteralDeclaration();
-    if (fld)
-    {   //printf("'%s' is a function literal\n", fld->toChars());
-        e = new FuncExp(loc, fld);
-        return e->semantic(sc);
-    }
-    f = s->isFuncDeclaration();
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
-
-        if (!f->originalType && f->scope)       // semantic not yet run
-            f->semantic(f->scope);
+        if (f->isUnitTestDeclaration())
+        {
+            error("cannot call unittest function %s", toChars());
+            return new ErrorExp();
+        }
-        if (!f->type->deco)
-        {
-            error("forward reference to %s", toChars());
-            return new ErrorExp();
-        }
-        return new VarExp(loc, f);
-    }
-    cd = s->isClassDeclaration();
-    if (cd && thiscd && cd->isBaseOf(thiscd, NULL) && sc->func->needThis())
-    {
-        // We need to add an implicit 'this' if cd is this class or a base class.
-        DotTypeExp *dte;
-
-        dte = new DotTypeExp(loc, new ThisExp(loc), s);
-        return dte->semantic(sc);
-    }
-    imp = s->isImport();
-    if (imp)
-    {
-        if (!imp->pkg)

trunk/src/expression.c

@@ -2309 +2309 @@
-            return e;
-        }
-
-        e = new VarExp(loc, v);
-        e->type = type;
-        e = e->semantic(sc);
-        return e->deref();
-    }
-    fld = s->isFuncLiteralDeclaration();
-    if (fld)
-    {   //printf("'%s' is a function literal\n", fld->toChars());
-        e = new FuncExp(loc, fld);
-        return e->semantic(sc);
-    }
-    f = s->isFuncDeclaration();
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
-
-        if (!f->originalType && f->scope)       // semantic not yet run
-            f->semantic(f->scope);
+        if (f->isUnitTestDeclaration())
+        {
+            error("cannot call unittest function %s", toChars());
+            return new ErrorExp();
+        }
-        if (!f->type->deco)
-        {
-            error("forward reference to %s", toChars());
-            return new ErrorExp();
-        }
-        return new VarExp(loc, f, hasOverloads);
-    }
-    o = s->isOverloadSet();
-    if (o)
-    {   //printf("'%s' is an overload set\n", o->toChars());
-        return new OverExp(o);
-    }
-    cd = s->isClassDeclaration();
-    if (cd && thiscd && cd->isBaseOf(thiscd, NULL) && sc->func->needThis())
-    {
-        // We need to add an implicit 'this' if cd is this class or a base class.
-        DotTypeExp *dte;
-
-        dte = new DotTypeExp(loc, new ThisExp(loc), s);
-        return dte->semantic(sc);