Merge DMD r294: bugzilla 2816 Sudden-death static assert is not...

bugzilla 2816 Sudden-death static assert is not very useful.
---
 dmd/expression.h   |   12 ++++++
 dmd/staticassert.c |   10 +---
 dmd/template.c     |  108 ++++++++++++++++++++++++++++++++++++++++++++++++----
 dmd/template.h     |    2 +
 4 files changed, 117 insertions(+), 15 deletions(-)
This commit is contained in:
Leandro Lucarella
2010-01-06 15:18:21 -03:00
parent d6891f8f24
commit 9eba8c9f32
4 changed files with 117 additions and 15 deletions

View File

@@ -18,6 +18,7 @@
#include "hdrgen.h"
#include "scope.h"
#include "template.h"
#include "declaration.h"
/********************************* AttribDeclaration ****************************/
@@ -48,10 +49,6 @@ void StaticAssert::semantic(Scope *sc)
{
}
#include "scope.h"
#include "template.h"
#include "declaration.h"
void StaticAssert::semantic2(Scope *sc)
{
Expression *e;
@@ -73,11 +70,10 @@ void StaticAssert::semantic2(Scope *sc)
}
else
error("(%s) is false", exp->toChars());
if(sc->tinst)
if (sc->tinst)
sc->tinst->printInstantiationTrace();
if (!global.gag) {
if (!global.gag)
fatal();
}
}
else if (!e->isBool(TRUE))
{