diff dmd/interpret.c @ 336:aaade6ded589 trunk

[svn r357] Merged DMD 1.033
author lindquist
date Sat, 12 Jul 2008 19:38:31 +0200
parents 5acec6b2eef8
children 870652a9af23
line wrap: on
line diff
--- a/dmd/interpret.c	Sat Jul 12 17:04:36 2008 +0200
+++ b/dmd/interpret.c	Sat Jul 12 19:38:31 2008 +0200
@@ -729,7 +729,7 @@
     return e;
 }
 
-#if V2
+#if DMDV2
 Expression *ForeachRangeStatement::interpret(InterState *istate)
 {
 #if LOG
@@ -989,7 +989,7 @@
     SymbolDeclaration *s = d->isSymbolDeclaration();
     if (v)
     {
-#if V2
+#if DMDV2
 	if ((v->isConst() || v->isInvariant()) && v->init && !v->value)
 #else
 	if (v->isConst() && v->init)
@@ -1045,7 +1045,7 @@
 	    else if (v->init->isVoidInitializer())
 		e = NULL;
 	}
-#if V2
+#if DMDV2
 	else if (s == v && (v->isConst() || v->isInvariant()) && v->init)
 #else
 	else if (s == v && v->isConst() && v->init)
@@ -1855,7 +1855,7 @@
 	FuncDeclaration *fd = ((VarExp *)e1)->var->isFuncDeclaration();
 	if (fd)
 	{
-#if V2
+#if DMDV2
 	    enum BUILTIN b = fd->isBuiltin();
 	    if (b)
 	    {	Expressions args;