diff dmd/TypeInstance.d @ 113:3482c73a991b

More cleanup for arrays
author Eldar Insafutdinov <e.insafutdinov@gmail.com>
date Tue, 31 Aug 2010 23:57:32 +0100
parents 3a0b150c9841
children e28b18c23469
line wrap: on
line diff
--- a/dmd/TypeInstance.d	Wed Sep 01 00:14:27 2010 +0200
+++ b/dmd/TypeInstance.d	Tue Aug 31 23:57:32 2010 +0100
@@ -207,9 +207,9 @@
 						goto Lnomatch;
 					if (ta.specAlias && sa != ta.specAlias)
 						goto Lnomatch;
-					if (dedtypes.data[i])
+					if (dedtypes[i])
 					{   // Must match already deduced symbol
-						Object s = cast(Object)dedtypes.data[i];
+						Object s = dedtypes[i];
 
 						if (s != sa)
 							goto Lnomatch;
@@ -227,17 +227,17 @@
 				//printf("\ttest: tempinst->tiargs[%d]\n", i);
 				Object o1;
 				if (i < tempinst.tiargs.dim)
-					o1 = cast(Object)tempinst.tiargs.data[i];
+					o1 = tempinst.tiargs[i];
 				else if (i < tempinst.tdtypes.dim && i < tp.tempinst.tiargs.dim)
 					// Pick up default arg
-					o1 = cast(Object)tempinst.tdtypes.data[i];
+					o1 = tempinst.tdtypes[i];
 				else
 					break;
 
 				if (i >= tp.tempinst.tiargs.dim)
 					goto Lnomatch;
 
-				Object o2 = cast(Object)tp.tempinst.tiargs.data[i];
+				Object o2 = tp.tempinst.tiargs[i];
 
 				Type t1 = isType(o1);
 				Type t2 = isType(o2);
@@ -329,7 +329,7 @@
 					TemplateValueParameter tv = tp_.isTemplateValueParameter();
 					if (!tv)
 						goto Lnomatch;
-					Expression e = cast(Expression)dedtypes.data[j];
+					Expression e = cast(Expression)dedtypes[j];
 					if (e)
 					{
 						if (!e1.equals(e))
@@ -353,7 +353,7 @@
 					TemplateAliasParameter ta = tp_.isTemplateAliasParameter();
 					if (!ta)
 						goto Lnomatch;
-					Dsymbol s = cast(Dsymbol)dedtypes.data[j];
+					auto s = cast(Dsymbol)dedtypes[j];
 					if (s)
 					{
 						if (!s1.equals(s))