--- a/dmd/cond.c	Tue Jan 06 15:54:48 2009 +0100
+++ b/dmd/cond.c	Tue Jan 06 16:33:51 2009 +0100
@@ -1,391 +1,391 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2006 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "id.h"
-#include "init.h"
-#include "declaration.h"
-#include "identifier.h"
-#include "expression.h"
-#include "cond.h"
-#include "module.h"
-#include "template.h"
-#include "lexer.h"
-#ifdef _DH
-#include "mtype.h"
-#include "scope.h"
-#endif
-
-int findCondition(Array *ids, Identifier *ident)
-{
-    if (ids)
-    {
-	for (int i = 0; i < ids->dim; i++)
-	{
-	    char *id = (char *)ids->data[i];
-
-	    if (strcmp(id, ident->toChars()) == 0)
-		return TRUE;
-	}
-    }
-
-    return FALSE;
-}
-
-/* ============================================================ */
-
-Condition::Condition(Loc loc)
-{
-    this->loc = loc;
-    inc = 0;
-}
-
-/* ============================================================ */
-
-DVCondition::DVCondition(Module *mod, unsigned level, Identifier *ident)
-	: Condition(0)
-{
-    this->mod = mod;
-    this->level = level;
-    this->ident = ident;
-}
-
-Condition *DVCondition::syntaxCopy()
-{
-    return this;	// don't need to copy
-}
-
-/* ============================================================ */
-
-void DebugCondition::setGlobalLevel(unsigned level)
-{
-    global.params.debuglevel = level;
-}
-
-void DebugCondition::addGlobalIdent(char *ident)
-{
-    if (!global.params.debugids)
-	global.params.debugids = new Array();
-    global.params.debugids->push(ident);
-}
-
-
-DebugCondition::DebugCondition(Module *mod, unsigned level, Identifier *ident)
-    : DVCondition(mod, level, ident)
-{
-}
-
-int DebugCondition::include(Scope *sc, ScopeDsymbol *s)
-{
-    //printf("DebugCondition::include() level = %d, debuglevel = %d\n", level, global.params.debuglevel);
-    if (inc == 0)
-    {
-	inc = 2;
-	if (ident)
-	{
-	    if (findCondition(mod->debugids, ident))
-		inc = 1;
-	    else if (findCondition(global.params.debugids, ident))
-		inc = 1;
-	    else
-	    {	if (!mod->debugidsNot)
-		    mod->debugidsNot = new Array();
-		mod->debugidsNot->push(ident->toChars());
-	    }
-	}
-	else if (level <= global.params.debuglevel || level <= mod->debuglevel)
-	    inc = 1;
-    }
-    return (inc == 1);
-}
-
-void DebugCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    if (ident)
-	buf->printf("debug (%s)", ident->toChars());
-    else
-	buf->printf("debug (%u)", level);
-}
-
-/* ============================================================ */
-
-void VersionCondition::setGlobalLevel(unsigned level)
-{
-    global.params.versionlevel = level;
-}
-
-void VersionCondition::checkPredefined(Loc loc, char *ident)
-{
-    static char* reserved[] =
-    {
-	"DigitalMars", "LLVM", "LDC", "LLVM64",
-    "X86", "X86_64", "PPC", "PPC64",
-	"Windows", "Win32", "Win64",
-	"linux", "darwin", "Posix",
-	"LittleEndian", "BigEndian",
-	"all",
-	"none",
-    };
-
-    for (unsigned i = 0; i < sizeof(reserved) / sizeof(reserved[0]); i++)
-    {
-	if (strcmp(ident, reserved[i]) == 0)
-	    goto Lerror;
-    }
-
-    if (ident[0] == 'D' && ident[1] == '_')
-	goto Lerror;
-
-    return;
-
-  Lerror:
-    error(loc, "version identifier '%s' is reserved and cannot be set", ident);
-}
-
-void VersionCondition::addGlobalIdent(char *ident)
-{
-    checkPredefined(0, ident);
-    addPredefinedGlobalIdent(ident);
-}
-
-void VersionCondition::addPredefinedGlobalIdent(char *ident)
-{
-    if (!global.params.versionids)
-	global.params.versionids = new Array();
-    global.params.versionids->push(ident);
-}
-
-
-VersionCondition::VersionCondition(Module *mod, unsigned level, Identifier *ident)
-    : DVCondition(mod, level, ident)
-{
-}
-
-int VersionCondition::include(Scope *sc, ScopeDsymbol *s)
-{
-    //printf("VersionCondition::include() level = %d, versionlevel = %d\n", level, global.params.versionlevel);
-    //if (ident) printf("\tident = '%s'\n", ident->toChars());
-    if (inc == 0)
-    {
-	inc = 2;
-	if (ident)
-	{
-	    if (findCondition(mod->versionids, ident))
-		inc = 1;
-	    else if (findCondition(global.params.versionids, ident))
-		inc = 1;
-	    else
-	    {
-		if (!mod->versionidsNot)
-		    mod->versionidsNot = new Array();
-		mod->versionidsNot->push(ident->toChars());
-	    }
-	}
-	else if (level <= global.params.versionlevel || level <= mod->versionlevel)
-	    inc = 1;
-    }
-    return (inc == 1);
-}
-
-void VersionCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    if (ident)
-	buf->printf("version (%s)", ident->toChars());
-    else
-	buf->printf("version (%u)", level);
-}
-
-
-/**************************** StaticIfCondition *******************************/
-
-StaticIfCondition::StaticIfCondition(Loc loc, Expression *exp)
-    : Condition(loc)
-{
-    this->exp = exp;
-}
-
-Condition *StaticIfCondition::syntaxCopy()
-{
-    return new StaticIfCondition(loc, exp->syntaxCopy());
-}
-
-int StaticIfCondition::include(Scope *sc, ScopeDsymbol *s)
-{
-#if 0
-    printf("StaticIfCondition::include(sc = %p, s = %p)\n", sc, s);
-    if (s)
-    {
-	printf("\ts = '%s', kind = %s\n", s->toChars(), s->kind());
-    }
-#endif
-    if (inc == 0)
-    {
-	if (!sc)
-	{
-	    error(loc, "static if conditional cannot be at global scope");
-	    inc = 2;
-	    return 0;
-	}
-
-	sc = sc->push(sc->scopesym);
-	sc->sd = s;			// s gets any addMember()
-	sc->flags |= SCOPEstaticif;
-	Expression *e = exp->semantic(sc);
-	sc->pop();
-	e = e->optimize(WANTvalue | WANTinterpret);
-	if (e->isBool(TRUE))
-	    inc = 1;
-	else if (e->isBool(FALSE))
-	    inc = 2;
-	else
-	{
-	    e->error("expression %s is not constant or does not evaluate to a bool", e->toChars());
-	    inc = 2;
-	}
-    }
-    return (inc == 1);
-}
-
-void StaticIfCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("static if(");
-    exp->toCBuffer(buf, hgs);
-    buf->writeByte(')');
-}
-
-
-/**************************** IftypeCondition *******************************/
-
-IftypeCondition::IftypeCondition(Loc loc, Type *targ, Identifier *id, enum TOK tok, Type *tspec)
-    : Condition(loc)
-{
-    this->targ = targ;
-    this->id = id;
-    this->tok = tok;
-    this->tspec = tspec;
-}
-
-Condition *IftypeCondition::syntaxCopy()
-{
-    return new IftypeCondition(loc,
-	targ->syntaxCopy(),
-	id,
-	tok,
-	tspec ? tspec->syntaxCopy() : NULL);
-}
-
-int IftypeCondition::include(Scope *sc, ScopeDsymbol *sd)
-{
-    //printf("IftypeCondition::include()\n");
-    if (inc == 0)
-    {
-	if (!sc)
-	{
-	    error(loc, "iftype conditional cannot be at global scope");
-	    inc = 2;
-	    return 0;
-	}
-	unsigned errors = global.errors;
-	global.gag++;			// suppress printing of error messages
-	targ = targ->semantic(loc, sc);
-	global.gag--;
-	if (errors != global.errors)	// if any errors happened
-	{   inc = 2;			// then condition is false
-	    global.errors = errors;
-	}
-	else if (id && tspec)
-	{
-	    /* Evaluate to TRUE if targ matches tspec.
-	     * If TRUE, declare id as an alias for the specialized type.
-	     */
-
-	    MATCH m;
-	    TemplateTypeParameter tp(loc, id, NULL, NULL);
-
-	    TemplateParameters parameters;
-	    parameters.setDim(1);
-	    parameters.data[0] = (void *)&tp;
-
-	    Objects dedtypes;
-	    dedtypes.setDim(1);
-
-	    m = targ->deduceType(NULL, tspec, &parameters, &dedtypes);
-	    if (m == MATCHnomatch ||
-		(m != MATCHexact && tok == TOKequal))
-		inc = 2;
-	    else
-	    {
-		inc = 1;
-		Type *tded = (Type *)dedtypes.data[0];
-		if (!tded)
-		    tded = targ;
-		Dsymbol *s = new AliasDeclaration(loc, id, tded);
-		s->semantic(sc);
-		sc->insert(s);
-		if (sd)
-		    s->addMember(sc, sd, 1);
-	    }
-	}
-	else if (id)
-	{
-	    /* Declare id as an alias for type targ. Evaluate to TRUE
-	     */
-	    Dsymbol *s = new AliasDeclaration(loc, id, targ);
-	    s->semantic(sc);
-	    sc->insert(s);
-	    if (sd)
-		s->addMember(sc, sd, 1);
-	    inc = 1;
-	}
-	else if (tspec)
-	{
-	    /* Evaluate to TRUE if targ matches tspec
-	     */
-	    tspec = tspec->semantic(loc, sc);
-	    //printf("targ  = %s\n", targ->toChars());
-	    //printf("tspec = %s\n", tspec->toChars());
-	    if (tok == TOKcolon)
-	    {   if (targ->implicitConvTo(tspec))
-		    inc = 1;
-		else
-		    inc = 2;
-	    }
-	    else /* == */
-	    {	if (targ->equals(tspec))
-		    inc = 1;
-		else
-		    inc = 2;
-	    }
-	}
-	else
-	     inc = 1;
-	//printf("inc = %d\n", inc);
-    }
-    return (inc == 1);
-}
-
-void IftypeCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("iftype(");
-    targ->toCBuffer(buf, id, hgs);
-    if (tspec)
-    {
-	if (tok == TOKcolon)
-	    buf->writestring(" : ");
-	else
-	    buf->writestring(" == ");
-	tspec->toCBuffer(buf, NULL, hgs);
-    }
-    buf->writeByte(')');
-}
-
-
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2006 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "id.h"
+#include "init.h"
+#include "declaration.h"
+#include "identifier.h"
+#include "expression.h"
+#include "cond.h"
+#include "module.h"
+#include "template.h"
+#include "lexer.h"
+#ifdef _DH
+#include "mtype.h"
+#include "scope.h"
+#endif
+
+int findCondition(Array *ids, Identifier *ident)
+{
+    if (ids)
+    {
+	for (int i = 0; i < ids->dim; i++)
+	{
+	    char *id = (char *)ids->data[i];
+
+	    if (strcmp(id, ident->toChars()) == 0)
+		return TRUE;
+	}
+    }
+
+    return FALSE;
+}
+
+/* ============================================================ */
+
+Condition::Condition(Loc loc)
+{
+    this->loc = loc;
+    inc = 0;
+}
+
+/* ============================================================ */
+
+DVCondition::DVCondition(Module *mod, unsigned level, Identifier *ident)
+	: Condition(0)
+{
+    this->mod = mod;
+    this->level = level;
+    this->ident = ident;
+}
+
+Condition *DVCondition::syntaxCopy()
+{
+    return this;	// don't need to copy
+}
+
+/* ============================================================ */
+
+void DebugCondition::setGlobalLevel(unsigned level)
+{
+    global.params.debuglevel = level;
+}
+
+void DebugCondition::addGlobalIdent(char *ident)
+{
+    if (!global.params.debugids)
+	global.params.debugids = new Array();
+    global.params.debugids->push(ident);
+}
+
+
+DebugCondition::DebugCondition(Module *mod, unsigned level, Identifier *ident)
+    : DVCondition(mod, level, ident)
+{
+}
+
+int DebugCondition::include(Scope *sc, ScopeDsymbol *s)
+{
+    //printf("DebugCondition::include() level = %d, debuglevel = %d\n", level, global.params.debuglevel);
+    if (inc == 0)
+    {
+	inc = 2;
+	if (ident)
+	{
+	    if (findCondition(mod->debugids, ident))
+		inc = 1;
+	    else if (findCondition(global.params.debugids, ident))
+		inc = 1;
+	    else
+	    {	if (!mod->debugidsNot)
+		    mod->debugidsNot = new Array();
+		mod->debugidsNot->push(ident->toChars());
+	    }
+	}
+	else if (level <= global.params.debuglevel || level <= mod->debuglevel)
+	    inc = 1;
+    }
+    return (inc == 1);
+}
+
+void DebugCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    if (ident)
+	buf->printf("debug (%s)", ident->toChars());
+    else
+	buf->printf("debug (%u)", level);
+}
+
+/* ============================================================ */
+
+void VersionCondition::setGlobalLevel(unsigned level)
+{
+    global.params.versionlevel = level;
+}
+
+void VersionCondition::checkPredefined(Loc loc, char *ident)
+{
+    static const char* reserved[] =
+    {
+	"DigitalMars", "LLVM", "LDC", "LLVM64",
+    "X86", "X86_64", "PPC", "PPC64",
+	"Windows", "Win32", "Win64",
+	"linux", "darwin", "Posix",
+	"LittleEndian", "BigEndian",
+	"all",
+	"none",
+    };
+
+    for (unsigned i = 0; i < sizeof(reserved) / sizeof(reserved[0]); i++)
+    {
+	if (strcmp(ident, reserved[i]) == 0)
+	    goto Lerror;
+    }
+
+    if (ident[0] == 'D' && ident[1] == '_')
+	goto Lerror;
+
+    return;
+
+  Lerror:
+    error(loc, "version identifier '%s' is reserved and cannot be set", ident);
+}
+
+void VersionCondition::addGlobalIdent(char *ident)
+{
+    checkPredefined(0, ident);
+    addPredefinedGlobalIdent(ident);
+}
+
+void VersionCondition::addPredefinedGlobalIdent(char *ident)
+{
+    if (!global.params.versionids)
+	global.params.versionids = new Array();
+    global.params.versionids->push(ident);
+}
+
+
+VersionCondition::VersionCondition(Module *mod, unsigned level, Identifier *ident)
+    : DVCondition(mod, level, ident)
+{
+}
+
+int VersionCondition::include(Scope *sc, ScopeDsymbol *s)
+{
+    //printf("VersionCondition::include() level = %d, versionlevel = %d\n", level, global.params.versionlevel);
+    //if (ident) printf("\tident = '%s'\n", ident->toChars());
+    if (inc == 0)
+    {
+	inc = 2;
+	if (ident)
+	{
+	    if (findCondition(mod->versionids, ident))
+		inc = 1;
+	    else if (findCondition(global.params.versionids, ident))
+		inc = 1;
+	    else
+	    {
+		if (!mod->versionidsNot)
+		    mod->versionidsNot = new Array();
+		mod->versionidsNot->push(ident->toChars());
+	    }
+	}
+	else if (level <= global.params.versionlevel || level <= mod->versionlevel)
+	    inc = 1;
+    }
+    return (inc == 1);
+}
+
+void VersionCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    if (ident)
+	buf->printf("version (%s)", ident->toChars());
+    else
+	buf->printf("version (%u)", level);
+}
+
+
+/**************************** StaticIfCondition *******************************/
+
+StaticIfCondition::StaticIfCondition(Loc loc, Expression *exp)
+    : Condition(loc)
+{
+    this->exp = exp;
+}
+
+Condition *StaticIfCondition::syntaxCopy()
+{
+    return new StaticIfCondition(loc, exp->syntaxCopy());
+}
+
+int StaticIfCondition::include(Scope *sc, ScopeDsymbol *s)
+{
+#if 0
+    printf("StaticIfCondition::include(sc = %p, s = %p)\n", sc, s);
+    if (s)
+    {
+	printf("\ts = '%s', kind = %s\n", s->toChars(), s->kind());
+    }
+#endif
+    if (inc == 0)
+    {
+	if (!sc)
+	{
+	    error(loc, "static if conditional cannot be at global scope");
+	    inc = 2;
+	    return 0;
+	}
+
+	sc = sc->push(sc->scopesym);
+	sc->sd = s;			// s gets any addMember()
+	sc->flags |= SCOPEstaticif;
+	Expression *e = exp->semantic(sc);
+	sc->pop();
+	e = e->optimize(WANTvalue | WANTinterpret);
+	if (e->isBool(TRUE))
+	    inc = 1;
+	else if (e->isBool(FALSE))
+	    inc = 2;
+	else
+	{
+	    e->error("expression %s is not constant or does not evaluate to a bool", e->toChars());
+	    inc = 2;
+	}
+    }
+    return (inc == 1);
+}
+
+void StaticIfCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("static if(");
+    exp->toCBuffer(buf, hgs);
+    buf->writeByte(')');
+}
+
+
+/**************************** IftypeCondition *******************************/
+
+IftypeCondition::IftypeCondition(Loc loc, Type *targ, Identifier *id, enum TOK tok, Type *tspec)
+    : Condition(loc)
+{
+    this->targ = targ;
+    this->id = id;
+    this->tok = tok;
+    this->tspec = tspec;
+}
+
+Condition *IftypeCondition::syntaxCopy()
+{
+    return new IftypeCondition(loc,
+	targ->syntaxCopy(),
+	id,
+	tok,
+	tspec ? tspec->syntaxCopy() : NULL);
+}
+
+int IftypeCondition::include(Scope *sc, ScopeDsymbol *sd)
+{
+    //printf("IftypeCondition::include()\n");
+    if (inc == 0)
+    {
+	if (!sc)
+	{
+	    error(loc, "iftype conditional cannot be at global scope");
+	    inc = 2;
+	    return 0;
+	}
+	unsigned errors = global.errors;
+	global.gag++;			// suppress printing of error messages
+	targ = targ->semantic(loc, sc);
+	global.gag--;
+	if (errors != global.errors)	// if any errors happened
+	{   inc = 2;			// then condition is false
+	    global.errors = errors;
+	}
+	else if (id && tspec)
+	{
+	    /* Evaluate to TRUE if targ matches tspec.
+	     * If TRUE, declare id as an alias for the specialized type.
+	     */
+
+	    MATCH m;
+	    TemplateTypeParameter tp(loc, id, NULL, NULL);
+
+	    TemplateParameters parameters;
+	    parameters.setDim(1);
+	    parameters.data[0] = (void *)&tp;
+
+	    Objects dedtypes;
+	    dedtypes.setDim(1);
+
+	    m = targ->deduceType(NULL, tspec, &parameters, &dedtypes);
+	    if (m == MATCHnomatch ||
+		(m != MATCHexact && tok == TOKequal))
+		inc = 2;
+	    else
+	    {
+		inc = 1;
+		Type *tded = (Type *)dedtypes.data[0];
+		if (!tded)
+		    tded = targ;
+		Dsymbol *s = new AliasDeclaration(loc, id, tded);
+		s->semantic(sc);
+		sc->insert(s);
+		if (sd)
+		    s->addMember(sc, sd, 1);
+	    }
+	}
+	else if (id)
+	{
+	    /* Declare id as an alias for type targ. Evaluate to TRUE
+	     */
+	    Dsymbol *s = new AliasDeclaration(loc, id, targ);
+	    s->semantic(sc);
+	    sc->insert(s);
+	    if (sd)
+		s->addMember(sc, sd, 1);
+	    inc = 1;
+	}
+	else if (tspec)
+	{
+	    /* Evaluate to TRUE if targ matches tspec
+	     */
+	    tspec = tspec->semantic(loc, sc);
+	    //printf("targ  = %s\n", targ->toChars());
+	    //printf("tspec = %s\n", tspec->toChars());
+	    if (tok == TOKcolon)
+	    {   if (targ->implicitConvTo(tspec))
+		    inc = 1;
+		else
+		    inc = 2;
+	    }
+	    else /* == */
+	    {	if (targ->equals(tspec))
+		    inc = 1;
+		else
+		    inc = 2;
+	    }
+	}
+	else
+	     inc = 1;
+	//printf("inc = %d\n", inc);
+    }
+    return (inc == 1);
+}
+
+void IftypeCondition::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("iftype(");
+    targ->toCBuffer(buf, id, hgs);
+    if (tspec)
+    {
+	if (tok == TOKcolon)
+	    buf->writestring(" : ");
+	else
+	    buf->writestring(" == ");
+	tspec->toCBuffer(buf, NULL, hgs);
+    }
+    buf->writeByte(')');
+}
+
+