--- a/trunk/src/dil/Parser.d	Sat Sep 22 14:58:44 2007 +0200
+++ b/trunk/src/dil/Parser.d	Sat Sep 22 15:32:08 2007 +0200
@@ -2828,12 +2828,12 @@
     switch (token.type)
     {
     case T.Int32, T.Int64, T.Uint32, T.Uint64:
-      e = new IntNumberExpression(token.type, token.ulong_);
+      e = new IntExpression(token.type, token.ulong_);
       nT();
       break;
     case T.Float32, T.Float64, T.Float80,
          T.Imaginary32, T.Imaginary64, T.Imaginary80:
-      e = new RealNumberExpression(token.type, token.real_);
+      e = new RealExpression(token.type, token.real_);
       nT();
       break;
     case T.Dollar:
@@ -3367,17 +3367,17 @@
       e = new DollarExpression();
       break;
     case T.Int32, T.Int64, T.Uint32, T.Uint64:
-      e = new IntNumberExpression(token.type, token.ulong_);
+      e = new IntExpression(token.type, token.ulong_);
       nT();
       break;
     case T.Float32, T.Float64, T.Float80,
          T.Imaginary32, T.Imaginary64, T.Imaginary80:
-      e = new RealNumberExpression(token.type, token.real_);
+      e = new RealExpression(token.type, token.real_);
       nT();
       break;
     case T.CharLiteral, T.WCharLiteral, T.DCharLiteral:
       nT();
-      e = new CharLiteralExpression();
+      e = new CharExpression();
       break;
     case T.String:
       Token*[] stringLiterals;
@@ -3386,7 +3386,7 @@
         stringLiterals ~= token;
         nT();
       } while (token.type == T.String)
-      e = new StringLiteralsExpression(stringLiterals);
+      e = new StringExpression(stringLiterals);
       break;
     case T.LBracket:
       Expression[] values;
@@ -3426,7 +3426,7 @@
         nT();
       }
       require(T.RBracket);
-      e = new AssocArrayLiteralExpression(keys, values);
+      e = new AArrayLiteralExpression(keys, values);
       break;
     case T.LBrace:
       // DelegateLiteral := { Statements }