Mercurial > projects > ddmd
diff dmd/TypeTuple.d @ 130:60bb0fe4563e
dmdfe 2.037 first main iteration
author | Eldar Insafutdinov <e.insafutdinov@gmail.com> |
---|---|
date | Thu, 09 Sep 2010 22:51:44 +0100 |
parents | 1765f3ef917d |
children | af1bebfd96a4 |
line wrap: on
line diff
--- a/dmd/TypeTuple.d Sun Sep 05 15:32:22 2010 +0400 +++ b/dmd/TypeTuple.d Thu Sep 09 22:51:44 2010 +0100 @@ -15,15 +15,15 @@ import dmd.TY; import dmd.Id; import dmd.STC; -import dmd.Argument; +import dmd.Parameter; import dmd.ErrorExp; import dmd.IntegerExp; class TypeTuple : Type { - Arguments arguments; // types making up the tuple + Parameters arguments; // types making up the tuple - this(Arguments arguments) + this(Parameters arguments) { super(TY.Ttuple); //printf("TypeTuple(this = %p)\n", this); @@ -55,7 +55,7 @@ this(Expressions exps) { super(TY.Ttuple); - auto arguments = new Arguments; + auto arguments = new Parameters; if (exps) { arguments.setDim(exps.dim); @@ -63,7 +63,7 @@ { auto e = exps[i]; if (e.type.ty == Ttuple) e.error("cannot form tuple of tuples"); - auto arg = new Argument(STCundefined, e.type, null, null); + auto arg = new Parameter(STCundefined, e.type, null, null); arguments[i] = arg; } } @@ -72,7 +72,7 @@ override Type syntaxCopy() { - auto args = Argument.arraySyntaxCopy(arguments); + auto args = Parameter.arraySyntaxCopy(arguments); auto t = new TypeTuple(args); t.mod = mod; return t; @@ -102,7 +102,7 @@ return 1; } if (t.ty == Ttuple) - { TypeTuple tt = cast(TypeTuple)t; + { auto tt = cast(TypeTuple)t; if (arguments.dim == tt.arguments.dim) { @@ -135,7 +135,7 @@ override void toCBuffer2(OutBuffer buf, HdrGenState* hgs, MOD mod) { - Argument.argsToCBuffer(buf, hgs, arguments, 0); + Parameter.argsToCBuffer(buf, hgs, arguments, 0); } override void toDecoBuffer(OutBuffer buf, int flag) @@ -143,7 +143,7 @@ //printf("TypeTuple::toDecoBuffer() this = %p, %s\n", this, toChars()); Type.toDecoBuffer(buf, flag); OutBuffer buf2 = new OutBuffer(); - Argument.argsToDecoBuffer(buf2, arguments); + Parameter.argsToDecoBuffer(buf2, arguments); uint len = buf2.offset; //buf.printf("%d%.*s", len, len, cast(char *)buf2.extractData()); buf.printf("%d%s", len, buf2.extractString());