diff dmd/TemplateInstance.d @ 94:3a0b150c9841

Objects -> Vector!Object iteration 1
author Eldar Insafutdinov <e.insafutdinov@gmail.com>
date Mon, 30 Aug 2010 23:00:34 +0100
parents 21a53563c840
children 12c0c84d13fd
line wrap: on
line diff
--- a/dmd/TemplateInstance.d	Mon Aug 30 22:50:30 2010 +0200
+++ b/dmd/TemplateInstance.d	Mon Aug 30 23:00:34 2010 +0100
@@ -236,7 +236,7 @@
 		a.setDim(objs.dim);
 		for (size_t i = 0; i < objs.dim; i++)
 		{
-		    a.data[i] = cast(void*)objectSyntaxCopy(cast(Object)objs.data[i]);
+		    a[i] = objectSyntaxCopy(objs[i]);
 		}
 	    }
 	    return a;
@@ -847,11 +847,11 @@
 					if (ea.op != TOKvar || flags & 1)
 						ea = ea.optimize(WANTvalue | WANTinterpret);
 
-					tiargs.data[j] = cast(void*)ea;
+					tiargs[j] = ea;
 				}
 				else if (sa)
 				{	
-					tiargs.data[j] = cast(void*)sa;
+					tiargs[j] = sa;
 					TupleDeclaration d = sa.toAlias().isTupleDeclaration();
 					if (d)
 					{
@@ -875,19 +875,19 @@
 							tiargs.reserve(dim);
 							for (size_t i = 0; i < dim; i++)
 							{   
-								Argument arg = cast(Argument)tt.arguments.data[i];
-								tiargs.insert(j + i, cast(void*)arg.type);
+								auto arg = cast(Argument)tt.arguments.data[i];
+								tiargs.insert(j + i, arg.type);
 							}
 						}
 						j--;
 					}
 					else
-						tiargs.data[j] = cast(void*)ta;
+						tiargs[j] = ta;
 				}
 				else
 				{
 					assert(global.errors);
-					tiargs.data[j] = cast(void*)Type.terror;
+					tiargs[j] = Type.terror;
 				}
 			}
 			else if (ea)
@@ -901,7 +901,7 @@
 				ea = ea.semantic(sc);
 				if (ea.op != TOKvar || flags & 1)
 					ea = ea.optimize(WANTvalue | WANTinterpret);
-				tiargs.data[j] = cast(void*)ea;
+				tiargs[j] = ea;
 				if (ea.op == TOKtype)
 				{	
 					ta = ea.type;
@@ -917,7 +917,7 @@
 					{   
 						tiargs.reserve(dim);
 						for (size_t i = 0; i < dim; i++)
-						tiargs.insert(j + i, cast(void*)te.exps.data[i]);
+						tiargs.insert(j + i, te.exps[i]);
 					}
 					j--;
 				}