diff dmd/staticassert.c @ 1367:8026319762be

Merged DMD 1.045 !!!
author Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date Sat, 16 May 2009 22:21:31 +0200
parents d4e95db0e62b
children 1b24e9c7cc26
line wrap: on
line diff
--- a/dmd/staticassert.c	Sat May 16 18:37:16 2009 +0200
+++ b/dmd/staticassert.c	Sat May 16 22:21:31 2009 +0200
@@ -19,6 +19,7 @@
 #include "scope.h"
 #include "template.h"
 
+
 /********************************* AttribDeclaration ****************************/
 
 StaticAssert::StaticAssert(Loc loc, Expression *exp, Expression *msg)
@@ -47,6 +48,10 @@
 {
 }
 
+#include "scope.h"
+#include "template.h"
+#include "declaration.h"
+
 void StaticAssert::semantic2(Scope *sc)
 {
     Expression *e;
@@ -67,11 +72,12 @@
 	    error("%s", buf.toChars());
 	}
 	else
-	    error("is false");
-	if(sc->tinst)
+	    error("(%s) is false", exp->toChars());
+		if(sc->tinst)
 	    sc->tinst->printInstantiationTrace();
-	if (!global.gag)
-	    fatal();
+	  if (!global.gag) {
+	      fatal();
+	  }
     }
     else if (!e->isBool(TRUE))
     {