--- a/dmd/AndExp.d	Sat Aug 28 16:14:07 2010 +0200
+++ b/dmd/AndExp.d	Sat Aug 28 16:19:48 2010 +0200
@@ -1,27 +1,27 @@
-module dmd.AndExp;
-
-import dmd.Expression;
-import dmd.Identifier;
-import dmd.InterState;
-import dmd.OutBuffer;
-import dmd.Loc;
-import dmd.Scope;
-import dmd.IntRange;
-import dmd.IRState;
-import dmd.BinExp;
-import dmd.TOK;
+module dmd.AndExp;
+
+import dmd.Expression;
+import dmd.Identifier;
+import dmd.InterState;
+import dmd.OutBuffer;
+import dmd.Loc;
+import dmd.Scope;
+import dmd.IntRange;
+import dmd.IRState;
+import dmd.BinExp;
+import dmd.TOK;
 import dmd.ArrayTypes;
 import dmd.TY;
 import dmd.Type;
 import dmd.Id;
-import dmd.Global;
-
+import dmd.Global;
+
 import dmd.backend.elem;
 import dmd.backend.Util;
 import dmd.backend.OPER;
 import dmd.expression.Util;
-import dmd.expression.And;
-
+import dmd.expression.And;
+
 class AndExp : BinExp
 {
 	this(Loc loc, Expression e1, Expression e2)
@@ -29,7 +29,7 @@
 		super(loc, TOK.TOKand, AndExp.sizeof, e1, e2);
 	}
 
-	Expression semantic(Scope sc)
+	override Expression semantic(Scope sc)
 	{
 		Expression e;
 
@@ -59,7 +59,7 @@
 		return this;
 	}
 
-	Expression optimize(int result)
+	override Expression optimize(int result)
 	{
 		Expression e;
 
@@ -73,75 +73,75 @@
 		return e;
 	}
 
-	Expression interpret(InterState istate)
+	override Expression interpret(InterState istate)
 	{
 		assert(false);
 	}
 
-	void buildArrayIdent(OutBuffer buf, Expressions arguments)
+	override void buildArrayIdent(OutBuffer buf, Expressions arguments)
 	{
 		Exp_buildArrayIdent(buf, arguments, "And");
 	}
 
-	Expression buildArrayLoop(Arguments fparams)
+	override Expression buildArrayLoop(Arguments fparams)
 	{
-		/* Evaluate assign expressions left to right		
-		 */								
-		Expression ex1 = e1.buildArrayLoop(fparams);		
-		Expression ex2 = e2.buildArrayLoop(fparams);		
-		Expression e = new AndExp(Loc(0), ex1, ex2);			
+		/* Evaluate assign expressions left to right		
+		 */								
+		Expression ex1 = e1.buildArrayLoop(fparams);		
+		Expression ex2 = e2.buildArrayLoop(fparams);		
+		Expression e = new AndExp(Loc(0), ex1, ex2);			
 		return e;							
 	}
 
-	IntRange getIntRange()
+	override IntRange getIntRange()
 	{
-		IntRange ir;
-		IntRange ir1 = e1.getIntRange();
-		IntRange ir2 = e2.getIntRange();
-
-		ir.imin = ir1.imin;
-		if (ir2.imin < ir.imin)
-		ir.imin = ir2.imin;
-
-		ir.imax = ir1.imax;
-		if (ir2.imax > ir.imax)
-		ir.imax = ir2.imax;
-
-		ulong u;
-
-		u = getMask(ir1.imax);
-		ir.imin &= u;
-		ir.imax &= u;
-
-		u = getMask(ir2.imax);
-		ir.imin &= u;
-		ir.imax &= u;
-
-		ir.imin &= type.sizemask();
-		ir.imax &= type.sizemask();
-
-	//printf("AndExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
-	//e1.dump(0);
-
+		IntRange ir;
+		IntRange ir1 = e1.getIntRange();
+		IntRange ir2 = e2.getIntRange();
+
+		ir.imin = ir1.imin;
+		if (ir2.imin < ir.imin)
+		ir.imin = ir2.imin;
+
+		ir.imax = ir1.imax;
+		if (ir2.imax > ir.imax)
+		ir.imax = ir2.imax;
+
+		ulong u;
+
+		u = getMask(ir1.imax);
+		ir.imin &= u;
+		ir.imax &= u;
+
+		u = getMask(ir2.imax);
+		ir.imin &= u;
+		ir.imax &= u;
+
+		ir.imin &= type.sizemask();
+		ir.imax &= type.sizemask();
+
+	//printf("AndExp: imin = x%llx, imax = x%llx\n", ir.imin, ir.imax);
+	//e1.dump(0);
+
 		return ir;
 	}
 
-	bool isCommutative()
+	override bool isCommutative()
 	{
 		return true;
 	}
 
-	Identifier opId()
+	override Identifier opId()
 	{
 		return Id.iand;
 	}
 
-	Identifier opId_r()
+	override Identifier opId_r()
 	{
 		return Id.iand_r;
 	}
 
-	elem* toElem(IRState* irs)
+	override elem* toElem(IRState* irs)
 	{
 		return toElemBin(irs, OPER.OPand);
 	}