# HG changeset patch
# User Eldar Insafutdinov <e.insafutdinov@gmail.com>
# Date 1283196604 -3600
# Node ID 21a53563c840f6440ead8af38598f005aed3f385
# Parent  39648eb578f63e946ee9ba87cbfb328ddf7dfa24# Parent  37b95c3479757d8a95c0934ae5b5572e38bec1bb
merge

diff -r 39648eb578f6 -r 21a53563c840 dmd/AggregateDeclaration.d
--- a/dmd/AggregateDeclaration.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/AggregateDeclaration.d	Mon Aug 30 20:30:04 2010 +0100
@@ -207,8 +207,6 @@
 
     override void semantic3(Scope sc)
 	{
-		int i;
-
 		//printf("AggregateDeclaration.semantic3(%s)\n", toChars());
 		if (members)
 		{
@@ -221,8 +219,6 @@
 
     override void inlineScan()
 	{
-		int i;
-
 		//printf("AggregateDeclaration.inlineScan(%s)\n", toChars());
 		if (members)
 		{
diff -r 39648eb578f6 -r 21a53563c840 dmd/ClassDeclaration.d
--- a/dmd/ClassDeclaration.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/ClassDeclaration.d	Mon Aug 30 20:30:04 2010 +0100
@@ -307,7 +307,6 @@
 	
     override void semantic(Scope sc)
 	{
-		int i;
 		uint offset;
 
 		//printf("ClassDeclaration.semantic(%s), type = %p, sizeok = %d, this = %p\n", toChars(), type, sizeok, this);
@@ -364,7 +363,7 @@
 		error("cannot create C++ classes");
 
 		// Expand any tuples in baseclasses[]
-		for (i = 0; i < baseclasses.dim; )
+		for (int i = 0; i < baseclasses.dim; )
 		{	
 			BaseClass b = cast(BaseClass)baseclasses.data[i];
 		//printf("test1 %s %s\n", toChars(), b.type.toChars());
@@ -459,7 +458,7 @@
 
 		// Treat the remaining entries in baseclasses as interfaces
 		// Check for errors, handle forward references
-		for (i = (baseClass ? 1 : 0); i < baseclasses.dim; )
+		for (int i = (baseClass ? 1 : 0); i < baseclasses.dim; )
 		{	TypeClass tc;
 		BaseClass b;
 		Type tb;
@@ -690,10 +689,10 @@
 		}
 		structsize = sc.offset;
 		Scope scsave = sc;	/// a copy must be created?
-		int members_dim = members.dim;
 		sizeok = 0;
-		foreach (s; members)
+		foreach (Dsymbol s; members) {
 			s.semantic(sc);
+		}
 
 		if (sizeok == 2)
 		{	// semantic() failed because of forward references.
@@ -764,7 +763,7 @@
 }
 
 		// Allocate instance of each new interface
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (int i = 0; i < vtblInterfaces.dim; i++)
 		{
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 			uint thissize = PTRSIZE;
@@ -794,7 +793,7 @@
 
 static if (false) { // Do not call until toObjfile() because of forward references
 		// Fill in base class vtbl[]s
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (int i = 0; i < vtblInterfaces.dim; i++)
 		{
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 
@@ -1177,7 +1176,6 @@
     // Back end
     override void toObjFile(int multiobj)			// compile to .obj file
 	{
-		uint i;
 		uint offset;
 		Symbol* sinit;
 		enum_SC scclass;
@@ -1239,7 +1237,7 @@
 
 				// Call each of the destructors in dtors[]
 				// in reverse order
-				for (i = 0; i < dtors.dim; i++)
+				for (size_t i = 0; i < dtors.dim; i++)
 				{	
 					DtorDeclaration d = cast(DtorDeclaration)dtors.data[i];
 					Symbol* s = d.toSymbol();
@@ -1437,7 +1435,7 @@
 		// of the fixup (*)
 
 		offset += vtblInterfaces.dim * (4 * PTRSIZE);
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{	
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 			ClassDeclaration id = b.base;
@@ -1467,7 +1465,7 @@
 		// Put out the vtblInterfaces.data[].vtbl[]
 		// This must be mirrored with ClassDeclaration.baseVtblOffset()
 		//printf("putting out %d interface vtbl[]s for '%s'\n", vtblInterfaces.dim, toChars());
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{	
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 			ClassDeclaration id = b.base;
@@ -1557,7 +1555,7 @@
 		// Put out the overriding interface vtbl[]s.
 		// This must be mirrored with ClassDeclaration.baseVtblOffset()
 		//printf("putting out overriding interface vtbl[]s for '%s' at offset x%x\n", toChars(), offset);
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{	
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 			ClassDeclaration cd;
@@ -1615,6 +1613,7 @@
 		// Put out the vtbl[]
 		//printf("putting out %s.vtbl[]\n", toChars());
 		dt = null;
+		size_t i;
 		if (0)
 			i = 0;
 		else
@@ -1693,13 +1692,12 @@
     uint baseVtblOffset(BaseClass bc)
 	{
 		uint csymoffset;
-		int i;
 
 		//printf("ClassDeclaration.baseVtblOffset('%s', bc = %p)\n", toChars(), bc);
 		csymoffset = CLASSINFO_SIZE;
 		csymoffset += vtblInterfaces.dim * (4 * PTRSIZE);
 
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 
@@ -1734,7 +1732,7 @@
 		}
 	}
 	version (INTERFACE_VIRTUAL) {
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{	
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 			ClassDeclaration cd;
@@ -1828,7 +1826,7 @@
     void toDt2(dt_t** pdt, ClassDeclaration cd)
 	{
 		uint offset;
-		uint i;
+
 		dt_t* dt;
 		uint csymoffset;
 
@@ -1846,7 +1844,7 @@
 		}
 
 		// Note equivalence of this loop to struct's
-		for (i = 0; i < fields.dim; i++)
+		for (size_t i = 0; i < fields.dim; i++)
 		{
 			VarDeclaration v = cast(VarDeclaration)fields[i];
 			Initializer init;
@@ -1885,7 +1883,7 @@
 		// Interface vptr initializations
 		toSymbol();						// define csym
 
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{	
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 
diff -r 39648eb578f6 -r 21a53563c840 dmd/EnumDeclaration.d
--- a/dmd/EnumDeclaration.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/EnumDeclaration.d	Mon Aug 30 20:30:04 2010 +0100
@@ -309,8 +309,6 @@
 	
     override void toCBuffer(OutBuffer buf, HdrGenState* hgs)
 	{
-	   int i;
-
 	    buf.writestring("enum ");
 	    if (ident)
 	    {	buf.writestring(ident.toChars());
diff -r 39648eb578f6 -r 21a53563c840 dmd/FuncDeclaration.d
--- a/dmd/FuncDeclaration.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/FuncDeclaration.d	Mon Aug 30 20:30:04 2010 +0100
@@ -3162,7 +3162,7 @@
 		FuncDeclaration func = this;
 		ClassDeclaration cd = func.parent.isClassDeclaration();
 		int reverse;
-		int i;
+
 		int has_arguments;
 
 		//printf("FuncDeclaration.toObjFile(%p, %s.%s)\n", func, parent.toChars(), func.toChars());
@@ -3355,9 +3355,10 @@
 		}
 		if (parameters)
 		{
-			foreach (size_t i, Dsymbol s3; parameters)
+			size_t i = 0;
+			for ( ; i < parameters.dim; ++i)
 			{   
-				auto v = cast(VarDeclaration)s3;
+				auto v = cast(VarDeclaration)parameters[i];
 debug {
 				if (v.csym)
 					writef("parameter '%s'\n", v.toChars());
@@ -3371,7 +3372,7 @@
 		if (reverse)
 		{	
 			// Reverse params[] entries
-			for (i = 0; i < pi/2; i++)
+			for (size_t i = 0; i < pi/2; i++)
 			{   
 				Symbol* sptmp = params[i];
 				params[i] = params[pi - 1 - i];
@@ -3416,7 +3417,7 @@
 			params[1] = sp;
 		}
 
-		for (i = 0; i < pi; i++)
+		for (size_t i = 0; i < pi; i++)
 		{	
 			Symbol *sp = params[i];
 			sp.Sclass = SC.SCparameter;
@@ -3578,7 +3579,7 @@
 			obj_export(s, Poffset);
 		}
 
-		for (i = 0; i < irs.deferToObj.dim; i++)
+		for (size_t i = 0; i < irs.deferToObj.dim; i++)
 		{
 			Dsymbol ss = cast(Dsymbol)irs.deferToObj.data[i];
 			ss.toObjFile(0);
diff -r 39648eb578f6 -r 21a53563c840 dmd/InterfaceDeclaration.d
--- a/dmd/InterfaceDeclaration.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/InterfaceDeclaration.d	Mon Aug 30 20:30:04 2010 +0100
@@ -54,8 +54,6 @@
 	
     override void semantic(Scope sc)
 	{
-		int i;
-
 		//printf("InterfaceDeclaration.semantic(%s), type = %p\n", toChars(), type);
 		if (inuse)
 			return;
@@ -95,7 +93,7 @@
 		}
 
 		// Expand any tuples in baseclasses[]
-		for (i = 0; i < baseclasses.dim; )
+		for (size_t i = 0; i < baseclasses.dim; )
 		{	
 			BaseClass b = cast(BaseClass)baseclasses.data[0];
 			b.type = b.type.semantic(loc, sc);
@@ -120,7 +118,7 @@
 		cpp = 1;
 
 		// Check for errors, handle forward references
-		for (i = 0; i < baseclasses.dim; )
+		for (size_t i = 0; i < baseclasses.dim; )
 		{	
 			TypeClass tc;
 			BaseClass b;
@@ -189,7 +187,7 @@
 		vtbl.push(cast(void*)this);		// leave room at vtbl[0] for classinfo
 
 		// Cat together the vtbl[]'s from base interfaces
-		for (i = 0; i < interfaces_dim; i++)
+		for (size_t i = 0; i < interfaces_dim; i++)
 		{	
 			BaseClass b = interfaces[i];
 
@@ -344,7 +342,6 @@
 
     override void toObjFile(int multiobj)			// compile to .obj file
 	{
-		uint i;
 		uint offset;
 		Symbol* sinit;
 		SC scclass;
@@ -474,7 +471,7 @@
 		// of the fixup (*)
 
 		offset += vtblInterfaces.dim * (4 * PTRSIZE);
-		for (i = 0; i < vtblInterfaces.dim; i++)
+		for (size_t i = 0; i < vtblInterfaces.dim; i++)
 		{	
 			BaseClass b = cast(BaseClass)vtblInterfaces.data[i];
 			ClassDeclaration id = b.base;
diff -r 39648eb578f6 -r 21a53563c840 dmd/StructDeclaration.d
--- a/dmd/StructDeclaration.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/StructDeclaration.d	Mon Aug 30 20:30:04 2010 +0100
@@ -96,7 +96,6 @@
 	
     override void semantic(Scope sc)
 	{
-		int i;
 		Scope sc2;
 
 		//printf("+StructDeclaration.semantic(this=%p, '%s')\n", this, toChars());
diff -r 39648eb578f6 -r 21a53563c840 dmd/TemplateInstance.d
--- a/dmd/TemplateInstance.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/TemplateInstance.d	Mon Aug 30 20:30:04 2010 +0100
@@ -624,8 +624,6 @@
 
     override void semantic2(Scope sc)
 	{
-		int i;
-
 		if (semanticRun >= 2)
 			return;
 
diff -r 39648eb578f6 -r 21a53563c840 dmd/TemplateMixin.d
--- a/dmd/TemplateMixin.d	Mon Aug 30 20:27:56 2010 +0100
+++ b/dmd/TemplateMixin.d	Mon Aug 30 20:30:04 2010 +0100
@@ -344,8 +344,6 @@
 
 	override void semantic2(Scope sc)
 	{
-		int i;
-
 		if (semanticRun >= 2)
 			return;
 		semanticRun = 2;
@@ -374,8 +372,6 @@
 
 	override void semantic3(Scope sc)
 	{
-		int i;
-
 		if (semanticRun >= 3)
 			return;
 		semanticRun = 3;