Mercurial > projects > ddmd
diff dmd/FuncDeclaration.d @ 88:23280d154c5b
Merge
author | korDen |
---|---|
date | Mon, 30 Aug 2010 19:58:14 +0400 |
parents | b17640f0e4e8 be2ab491772e |
children | 37b95c347975 39648eb578f6 |
line wrap: on
line diff
--- a/dmd/FuncDeclaration.d Mon Aug 30 19:56:27 2010 +0400 +++ b/dmd/FuncDeclaration.d Mon Aug 30 19:58:14 2010 +0400 @@ -1929,7 +1929,7 @@ else e = p.type.defaultInit(Loc(0)); - args.data[u] = cast(void*)e; + args[u] = e; } MATCH m = cast(MATCH) tg.callMatch(null, args); @@ -2393,15 +2393,15 @@ return null; } } - eargs.data[i] = cast(void*)earg; + eargs[i] = earg; } for (size_t i = 0; i < dim; i++) { - Expression earg = cast(Expression)eargs.data[i]; + auto earg = eargs[i]; Argument arg = Argument.getNth(tf.parameters, i); auto v = cast(VarDeclaration)parameters[i]; - vsave.data[i] = cast(void*)v.value; + vsave[i] = v.value; version (LOG) { printf("arg[%d] = %s\n", i, earg.toChars()); } @@ -2492,7 +2492,7 @@ if (auto v = cast(VarDeclaration)s3) { //printf("\tsaving [%d] %s = %s\n", i, v.toChars(), v.value ? v.value.toChars() : ""); - valueSaves.data[i] = cast(void*)v.value; + valueSaves[i] = v.value; v.value = null; } } @@ -2698,7 +2698,7 @@ return 0; } - Expression doInline(InlineScanState* iss, Expression ethis, Array arguments) + Expression doInline(InlineScanState* iss, Expression ethis, Expressions arguments) { InlineDoState ids = new InlineDoState(); DeclarationExp de; @@ -3754,4 +3754,4 @@ override FuncDeclaration isFuncDeclaration() { return this; } } -class FuncDeclarations : Vector!FuncDeclaration { final typeof(this) copy() { auto a = new typeof(this); copyTo(a); return a; } } \ No newline at end of file +alias Vector!FuncDeclaration FuncDeclarations; \ No newline at end of file