--- a/dmd/arrayop.c	Wed Jan 06 15:18:19 2010 -0300
+++ b/dmd/arrayop.c	Wed Jan 06 15:18:20 2010 -0300
@@ -253,9 +253,9 @@
          *  return p;
          */
 
-        Arguments *fparams = new Arguments();
+        Parameters *fparams = new Parameters();
         Expression *loopbody = buildArrayLoop(fparams);
-        Argument *p = (Argument *)fparams->data[0 /*fparams->dim - 1*/];
+        Parameter *p = (Parameter *)fparams->data[0 /*fparams->dim - 1*/];
 #if DMDV1
         // for (size_t i = 0; i < p.length; i++)
         Initializer *init = new ExpInitializer(0, new IntegerExp(0, 0, Type::tsize_t));
@@ -268,7 +268,7 @@
 #else
         // foreach (i; 0 .. p.length)
         Statement *s1 = new ForeachRangeStatement(0, TOKforeach,
-        new Argument(0, NULL, Id::p, NULL),
+        new Parameter(0, NULL, Id::p, NULL),
         new IntegerExp(0, 0, Type::tint32),
         new ArrayLengthExp(0, new IdentifierExp(0, p->ident)),
         new ExpStatement(0, loopbody));
@@ -414,16 +414,16 @@
  * and build the parameter list.
  */
 
-Expression *Expression::buildArrayLoop(Arguments *fparams)
+Expression *Expression::buildArrayLoop(Parameters *fparams)
 {
     Identifier *id = Identifier::generateId("c", fparams->dim);
-    Argument *param = new Argument(0, type, id, NULL);
+    Parameter *param = new Parameter(0, type, id, NULL);
     fparams->shift(param);
     Expression *e = new IdentifierExp(0, id);
     return e;
 }
 
-Expression *CastExp::buildArrayLoop(Arguments *fparams)
+Expression *CastExp::buildArrayLoop(Parameters *fparams)
 {
     Type *tb = type->toBasetype();
     if (tb->ty == Tarray || tb->ty == Tsarray)
@@ -434,10 +434,10 @@
 	return Expression::buildArrayLoop(fparams);
 }
 
-Expression *SliceExp::buildArrayLoop(Arguments *fparams)
+Expression *SliceExp::buildArrayLoop(Parameters *fparams)
 {
     Identifier *id = Identifier::generateId("p", fparams->dim);
-    Argument *param = new Argument(STCconst, type, id, NULL);
+    Parameter *param = new Parameter(STCconst, type, id, NULL);
     fparams->shift(param);
     Expression *e = new IdentifierExp(0, id);
     Expressions *arguments = new Expressions();
@@ -447,7 +447,7 @@
     return e;
 }
 
-Expression *AssignExp::buildArrayLoop(Arguments *fparams)
+Expression *AssignExp::buildArrayLoop(Parameters *fparams)
 {
     /* Evaluate assign expressions right to left
      */
@@ -461,20 +461,20 @@
     ex2 = new CastExp(0, ex2, e1->type->nextOf());
 #endif
     Expression *ex1 = e1->buildArrayLoop(fparams);
-    Argument *param = (Argument *)fparams->data[0];
+    Parameter *param = (Parameter *)fparams->data[0];
     param->storageClass = 0;
     Expression *e = new AssignExp(0, ex1, ex2);
     return e;
 }
 
 #define X(Str) \
-Expression *Str##AssignExp::buildArrayLoop(Arguments *fparams)	\
+Expression *Str##AssignExp::buildArrayLoop(Parameters *fparams)	\
 {								\
     /* Evaluate assign expressions right to left		\
      */								\
     Expression *ex2 = e2->buildArrayLoop(fparams);		\
     Expression *ex1 = e1->buildArrayLoop(fparams);		\
-    Argument *param = (Argument *)fparams->data[0];		\
+    Parameter *param = (Parameter *)fparams->data[0];		\
     param->storageClass = 0;					\
     Expression *e = new Str##AssignExp(0, ex1, ex2);		\
     return e;							\
@@ -491,14 +491,14 @@
 
 #undef X
 
-Expression *NegExp::buildArrayLoop(Arguments *fparams)
+Expression *NegExp::buildArrayLoop(Parameters *fparams)
 {
     Expression *ex1 = e1->buildArrayLoop(fparams);
     Expression *e = new NegExp(0, ex1);
     return e;
 }
 
-Expression *ComExp::buildArrayLoop(Arguments *fparams)
+Expression *ComExp::buildArrayLoop(Parameters *fparams)
 {
     Expression *ex1 = e1->buildArrayLoop(fparams);
     Expression *e = new ComExp(0, ex1);
@@ -506,7 +506,7 @@
 }
 
 #define X(Str) \
-Expression *Str##Exp::buildArrayLoop(Arguments *fparams)	\
+Expression *Str##Exp::buildArrayLoop(Parameters *fparams)	\
 {								\
     /* Evaluate assign expressions left to right		\
      */								\