diff dmd/XorExp.d @ 72:2e2a5c3f943a

reduced warnings by adding override to the methods think this also normalizes different line endings used all over the place
author Trass3r
date Sat, 28 Aug 2010 16:19:48 +0200
parents f708f0452e81
children ceda59b4d255
line wrap: on
line diff
--- a/dmd/XorExp.d	Sat Aug 28 16:14:07 2010 +0200
+++ b/dmd/XorExp.d	Sat Aug 28 16:19:48 2010 +0200
@@ -1,26 +1,26 @@
-module dmd.XorExp;
-
-import dmd.Expression;
-import dmd.Identifier;
-import dmd.InterState;
+module dmd.XorExp;
+
+import dmd.Expression;
+import dmd.Identifier;
+import dmd.InterState;
 import dmd.MATCH;
-import dmd.Id;
-import dmd.Type;
-import dmd.OutBuffer;
-import dmd.Loc;
-import dmd.Scope;
-import dmd.IntRange;
-import dmd.IRState;
-import dmd.ArrayTypes;
-import dmd.BinExp;
+import dmd.Id;
+import dmd.Type;
+import dmd.OutBuffer;
+import dmd.Loc;
+import dmd.Scope;
+import dmd.IntRange;
+import dmd.IRState;
+import dmd.ArrayTypes;
+import dmd.BinExp;
 import dmd.TOK;
-import dmd.TY;
-
-import dmd.backend.elem;
+import dmd.TY;
+
+import dmd.backend.elem;
 import dmd.backend.OPER;
 import dmd.expression.Util;
-import dmd.expression.Xor;
-
+import dmd.expression.Xor;
+
 class XorExp : BinExp
 {
 	this(Loc loc, Expression e1, Expression e2)
@@ -28,7 +28,7 @@
 		super(loc, TOK.TOKxor, XorExp.sizeof, e1, e2);
 	}
 
-	Expression semantic(Scope sc)
+	override Expression semantic(Scope sc)
 	{
 		Expression e;
 
@@ -57,7 +57,7 @@
 		return this;
 	}
 
-	Expression optimize(int result)
+	override Expression optimize(int result)
 	{
 		Expression e;
 
@@ -71,62 +71,62 @@
 		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, "Xor");
 	}
 
-	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 XorExp(Loc(0), ex1, ex2);			
+		/* Evaluate assign expressions left to right		
+		 */								
+		Expression ex1 = e1.buildArrayLoop(fparams);		
+		Expression ex2 = e2.buildArrayLoop(fparams);		
+		Expression e = new XorExp(Loc(0), ex1, ex2);			
 		return e;							
 	}
 
-	MATCH implicitConvTo(Type t)
+	override MATCH implicitConvTo(Type t)
 	{
-		MATCH result = Expression.implicitConvTo(t);
-
-		if (result == MATCHnomatch)
-		{
-			MATCH m1 = e1.implicitConvTo(t);
-			MATCH m2 = e2.implicitConvTo(t);
-
-			// Pick the worst match
-			result = (m1 < m2) ? m1 : m2;
-		}
+		MATCH result = Expression.implicitConvTo(t);
+
+		if (result == MATCHnomatch)
+		{
+			MATCH m1 = e1.implicitConvTo(t);
+			MATCH m2 = e2.implicitConvTo(t);
+
+			// Pick the worst match
+			result = (m1 < m2) ? m1 : m2;
+		}
 		return result;
 	}
 
-	IntRange getIntRange()
+	override IntRange getIntRange()
 	{
 		assert(false);
 	}
 
-	bool isCommutative()
+	override bool isCommutative()
 	{
 		return true;
 	}
 
-	Identifier opId()
+	override Identifier opId()
 	{
 		return Id.ixor;
 	}
 
-	Identifier opId_r()
+	override Identifier opId_r()
 	{
 		return Id.ixor_r;
 	}
 
-	elem* toElem(IRState* irs)
+	override elem* toElem(IRState* irs)
 	{
 		return toElemBin(irs,OPxor);
 	}