--- a/dmd/statement.c	Wed Jan 06 15:18:19 2010 -0300
+++ b/dmd/statement.c	Wed Jan 06 15:18:20 2010 -0300
@@ -1254,7 +1254,7 @@
 
 /******************************** ForeachStatement ***************************/
 
-ForeachStatement::ForeachStatement(Loc loc, enum TOK op, Arguments *arguments,
+ForeachStatement::ForeachStatement(Loc loc, enum TOK op, Parameters *arguments,
 	Expression *aggr, Statement *body)
     : Statement(loc)
 {
@@ -1271,7 +1271,7 @@
 
 Statement *ForeachStatement::syntaxCopy()
 {
-    Arguments *args = Argument::arraySyntaxCopy(arguments);
+    Parameters *args = Parameter::arraySyntaxCopy(arguments);
     Expression *exp = aggr->syntaxCopy();
     ForeachStatement *s = new ForeachStatement(loc, op, args, exp,
 	body ? body->syntaxCopy() : NULL);
@@ -1334,7 +1334,7 @@
 	}
 	else if (aggr->op == TOKtype)	// type tuple
 	{
-	    n = Argument::dim(tuple->arguments);
+	    n = Parameter::dim(tuple->arguments);
 	}
 	else
 	    assert(0);
@@ -1345,8 +1345,8 @@
 	    if (te)
 		e = (Expression *)te->exps->data[k];
 	    else
-		t = Argument::getNth(tuple->arguments, k)->type;
-	    Argument *arg = (Argument *)arguments->data[0];
+		t = Parameter::getNth(tuple->arguments, k)->type;
+	    Parameter *arg = (Parameter *)arguments->data[0];
 	    Statements *st = new Statements();
 
 	    if (dim == 2)
@@ -1369,7 +1369,7 @@
 		var->storage_class |= STCconst;
 		DeclarationExp *de = new DeclarationExp(loc, var);
 		st->push(new ExpStatement(loc, de));
-		arg = (Argument *)arguments->data[1];	// value
+		arg = (Parameter *)arguments->data[1];	// value
 	    }
 	    // Declare value
 	    if (arg->storageClass & (STCout | STCref | STClazy))
@@ -1410,7 +1410,7 @@
     }
 
     for (size_t i = 0; i < dim; i++)
-    {	Argument *arg = (Argument *)arguments->data[i];
+    {	Parameter *arg = (Parameter *)arguments->data[i];
 	if (!arg->type)
 	{
 	    error("cannot infer type for %s", arg->ident->toChars());
@@ -1439,10 +1439,10 @@
 	     */
 	    tn = tab->nextOf()->toBasetype();
 	    if (tn->ty == Tchar || tn->ty == Twchar || tn->ty == Tdchar)
-	    {	Argument *arg;
+	    {	Parameter *arg;
 
 		int i = (dim == 1) ? 0 : 1;	// index of value
-		arg = (Argument *)arguments->data[i];
+		arg = (Parameter *)arguments->data[i];
 		arg->type = arg->type->semantic(loc, sc);
 		tnv = arg->type->toBasetype();
 		if (tnv->ty != tn->ty &&
@@ -1451,7 +1451,7 @@
 		    if (arg->storageClass & STCref)
 			error("foreach: value of UTF conversion cannot be ref");
 		    if (dim == 2)
-		    {	arg = (Argument *)arguments->data[0];
+		    {	arg = (Parameter *)arguments->data[0];
 			if (arg->storageClass & STCref)
 			    error("foreach: key cannot be ref");
 		    }
@@ -1461,7 +1461,7 @@
 
 	    for (size_t i = 0; i < dim; i++)
 	    {	// Declare args
-		Argument *arg = (Argument *)arguments->data[i];
+		Parameter *arg = (Parameter *)arguments->data[i];
 		Type *argtype = arg->type->semantic(loc, sc);
 		VarDeclaration *var;
 
@@ -1639,7 +1639,7 @@
 	    e = new VarExp(loc, r);
 	    Expression *einit = new DotIdExp(loc, e, idhead);
 //	    einit = einit->semantic(sc);
-	    Argument *arg = (Argument *)arguments->data[0];
+	    Parameter *arg = (Parameter *)arguments->data[0];
 	    VarDeclaration *ve = new VarDeclaration(loc, arg->type, arg->ident, new ExpInitializer(loc, einit));
 	    ve->storage_class |= STCforeach;
 	    ve->storage_class |= arg->storageClass & (STCin | STCout | STCref | STC_TYPECTOR);
@@ -1663,11 +1663,11 @@
 	case Tdelegate:
 	Lapply:
 	{   FuncDeclaration *fdapply;
-	    Arguments *args;
+	    Parameters *args;
 	    Expression *ec;
 	    Expression *e;
 	    FuncLiteralDeclaration *fld;
-	    Argument *a;
+	    Parameter *a;
 	    Type *t;
 	    Expression *flde;
 	    Identifier *id;
@@ -1694,9 +1694,9 @@
 	    /* Turn body into the function literal:
 	     *	int delegate(ref T arg) { body }
 	     */
-	    args = new Arguments();
+	    args = new Parameters();
 	    for (size_t i = 0; i < dim; i++)
-	    {	Argument *arg = (Argument *)arguments->data[i];
+	    {	Parameter *arg = (Parameter *)arguments->data[i];
 
 		arg->type = arg->type->semantic(loc, sc);
 		if (arg->storageClass & STCref)
@@ -1714,7 +1714,7 @@
 		    s = new DeclarationStatement(0, v);
 		    body = new CompoundStatement(loc, s, body);
 		}
-		a = new Argument(STCref, arg->type, id, NULL);
+		a = new Parameter(STCref, arg->type, id, NULL);
 		args->push(a);
 	    }
 	    t = new TypeFunction(args, Type::tint32, 0, LINKd);
@@ -1739,14 +1739,14 @@
 	    if (tab->ty == Taarray)
 	    {
 		// Check types
-		Argument *arg = (Argument *)arguments->data[0];
+		Parameter *arg = (Parameter *)arguments->data[0];
 		if (dim == 2)
 		{
 		    if (arg->storageClass & STCref)
 			error("foreach: index cannot be ref");
 		    if (!arg->type->equals(taa->index))
 			error("foreach: index must be type %s, not %s", taa->index->toChars(), arg->type->toChars());
-		    arg = (Argument *)arguments->data[1];
+		    arg = (Parameter *)arguments->data[1];
 		}
 		if (!arg->type->equals(taa->nextOf()))
 		    error("foreach: value must be type %s, not %s", taa->nextOf()->toChars(), arg->type->toChars());
@@ -1758,26 +1758,26 @@
 		static FuncDeclaration *aaApply2_fd = NULL;
         static TypeDelegate* aaApply2_dg;
 		if(!aaApply2_fd) {
-		    Arguments* args = new Arguments;
-		    args->push(new Argument(STCin, Type::tvoid->pointerTo(), NULL, NULL));
-		    args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-		    Arguments* dgargs = new Arguments;
-		    dgargs->push(new Argument(STCin, Type::tvoidptr, NULL, NULL));
-		    dgargs->push(new Argument(STCin, Type::tvoidptr, NULL, NULL));
+		    Parameters* args = new Parameters;
+		    args->push(new Parameter(STCin, Type::tvoid->pointerTo(), NULL, NULL));
+		    args->push(new Parameter(STCin, Type::tsize_t, NULL, NULL));
+		    Parameters* dgargs = new Parameters;
+		    dgargs->push(new Parameter(STCin, Type::tvoidptr, NULL, NULL));
+		    dgargs->push(new Parameter(STCin, Type::tvoidptr, NULL, NULL));
 		    aaApply2_dg = new TypeDelegate(new TypeFunction(dgargs, Type::tindex, 0, LINKd));
-		    args->push(new Argument(STCin, aaApply2_dg, NULL, NULL));
+		    args->push(new Parameter(STCin, aaApply2_dg, NULL, NULL));
 		    aaApply2_fd = FuncDeclaration::genCfunc(args, Type::tindex, "_aaApply2");
 		}
 		static FuncDeclaration *aaApply_fd = NULL;
         static TypeDelegate* aaApply_dg;
 		if(!aaApply_fd) {
-		    Arguments* args = new Arguments;
-		    args->push(new Argument(STCin, Type::tvoid->pointerTo(), NULL, NULL));
-		    args->push(new Argument(STCin, Type::tsize_t, NULL, NULL));
-		    Arguments* dgargs = new Arguments;
-		    dgargs->push(new Argument(STCin, Type::tvoidptr, NULL, NULL));
+		    Parameters* args = new Parameters;
+		    args->push(new Parameter(STCin, Type::tvoid->pointerTo(), NULL, NULL));
+		    args->push(new Parameter(STCin, Type::tsize_t, NULL, NULL));
+		    Parameters* dgargs = new Parameters;
+		    dgargs->push(new Parameter(STCin, Type::tvoidptr, NULL, NULL));
 		    aaApply_dg = new TypeDelegate(new TypeFunction(dgargs, Type::tindex, 0, LINKd));
-		    args->push(new Argument(STCin, aaApply_dg, NULL, NULL));
+		    args->push(new Parameter(STCin, aaApply_dg, NULL, NULL));
 		    aaApply_fd = FuncDeclaration::genCfunc(args, Type::tindex, "_aaApply");
 		}
 		if (dim == 2) {
@@ -1839,20 +1839,20 @@
 #endif
 		assert(j < sizeof(fdname));
 		//LDC: Build arguments.
-		Arguments* args = new Arguments;
-		args->push(new Argument(STCin, tn->arrayOf(), NULL, NULL));
+		Parameters* args = new Parameters;
+		args->push(new Parameter(STCin, tn->arrayOf(), NULL, NULL));
 		if (dim == 2) {
-		    Arguments* dgargs = new Arguments;
-		    dgargs->push(new Argument(STCin, Type::tvoidptr, NULL, NULL));
-		    dgargs->push(new Argument(STCin, Type::tvoidptr, NULL, NULL));
+		    Parameters* dgargs = new Parameters;
+		    dgargs->push(new Parameter(STCin, Type::tvoidptr, NULL, NULL));
+		    dgargs->push(new Parameter(STCin, Type::tvoidptr, NULL, NULL));
 		    dgty = new TypeDelegate(new TypeFunction(dgargs, Type::tindex, 0, LINKd));
-		    args->push(new Argument(STCin, dgty, NULL, NULL));
+		    args->push(new Parameter(STCin, dgty, NULL, NULL));
 		    fdapply = FuncDeclaration::genCfunc(args, Type::tindex, fdname);
 		} else {
-		    Arguments* dgargs = new Arguments;
-		    dgargs->push(new Argument(STCin, Type::tvoidptr, NULL, NULL));
+		    Parameters* dgargs = new Parameters;
+		    dgargs->push(new Parameter(STCin, Type::tvoidptr, NULL, NULL));
 		    dgty = new TypeDelegate(new TypeFunction(dgargs, Type::tindex, 0, LINKd));
-		    args->push(new Argument(STCin, dgty, NULL, NULL));
+		    args->push(new Parameter(STCin, dgty, NULL, NULL));
 		    fdapply = FuncDeclaration::genCfunc(args, Type::tindex, fdname);
 		}
 
@@ -1980,7 +1980,7 @@
     buf->writestring(" (");
     for (int i = 0; i < arguments->dim; i++)
     {
-	Argument *a = (Argument *)arguments->data[i];
+	Parameter *a = (Parameter *)arguments->data[i];
 	if (i)
 	    buf->writestring(", ");
 	if (a->storageClass & STCref)
@@ -2007,7 +2007,7 @@
 
 #if DMDV2
 
-ForeachRangeStatement::ForeachRangeStatement(Loc loc, enum TOK op, Argument *arg,
+ForeachRangeStatement::ForeachRangeStatement(Loc loc, enum TOK op, Parameter *arg,
 	Expression *lwr, Expression *upr, Statement *body)
     : Statement(loc)
 {
@@ -2215,7 +2215,7 @@
 
 /******************************** IfStatement ***************************/
 
-IfStatement::IfStatement(Loc loc, Argument *arg, Expression *condition, Statement *ifbody, Statement *elsebody)
+IfStatement::IfStatement(Loc loc, Parameter *arg, Expression *condition, Statement *ifbody, Statement *elsebody)
     : Statement(loc)
 {
     this->arg = arg;
@@ -2235,7 +2235,7 @@
     if (elsebody)
 	e = elsebody->syntaxCopy();
 
-    Argument *a = arg ? arg->syntaxCopy() : NULL;
+    Parameter *a = arg ? arg->syntaxCopy() : NULL;
     IfStatement *s = new IfStatement(loc, a, condition->syntaxCopy(), i, e);
     return s;
 }