# HG changeset patch
# User Aziz K?ksal <aziz.koeksal@gmail.com>
# Date 1190467928 -7200
# Node ID ff1d11c27061d15c8dce04f16fe3c2652dd8ab8d
# Parent  f7bb892d64c23d7d6e9ac1d762ee6ff2171eed8d
Renamed some Expression classes.

diff -r f7bb892d64c2 -r ff1d11c27061 trunk/src/dil/Expressions.d
--- a/trunk/src/dil/Expressions.d	Sat Sep 22 14:58:44 2007 +0200
+++ b/trunk/src/dil/Expressions.d	Sat Sep 22 15:32:08 2007 +0200
@@ -669,7 +669,7 @@
   }
 }
 
-class IntNumberExpression : Expression
+class IntExpression : Expression
 {
   TOK type;
   ulong number;
@@ -681,7 +681,7 @@
   }
 }
 
-class RealNumberExpression : Expression
+class RealExpression : Expression
 {
   TOK type;
   real number;
@@ -693,7 +693,7 @@
   }
 }
 
-class CharLiteralExpression : Expression
+class CharExpression : Expression
 {
   this()
   {
@@ -701,7 +701,7 @@
   }
 }
 
-class StringLiteralsExpression : Expression
+class StringExpression : Expression
 {
   Token*[] strings;
   this(Token*[] strings)
@@ -732,7 +732,7 @@
   }
 }
 
-class AssocArrayLiteralExpression : Expression
+class AArrayLiteralExpression : Expression
 {
   Expression[] keys, values;
   this(Expression[] keys, Expression[] values)
diff -r f7bb892d64c2 -r ff1d11c27061 trunk/src/dil/Parser.d
--- 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 }
diff -r f7bb892d64c2 -r ff1d11c27061 trunk/src/dil/Settings.d
--- a/trunk/src/dil/Settings.d	Sat Sep 22 14:58:44 2007 +0200
+++ b/trunk/src/dil/Settings.d	Sat Sep 22 15:32:08 2007 +0200
@@ -72,7 +72,7 @@
         auto e = v.values[0];
         if (!e)
           throw new Exception("langfile variable has no value set.");
-        auto val = Cast!(StringLiteralsExpression)(e);
+        auto val = Cast!(StringExpression)(e);
         if (val)
           // Set fileName to d-file with messages table.
           fileName = val.getString();
@@ -85,7 +85,7 @@
         if (auto array = Cast!(ArrayInitializer)(e))
         {
           foreach (value; array.values)
-            if (auto str = Cast!(StringLiteralsExpression)(value))
+            if (auto str = Cast!(StringExpression)(value))
               GlobalSettings.importPaths ~= str.getString();
         }
         else
@@ -118,7 +118,7 @@
         {
           foreach (value; array.values)
           {
-            if (auto str = Cast!(StringLiteralsExpression)(value))
+            if (auto str = Cast!(StringExpression)(value))
               messages ~= str.getString();
           }
         }
@@ -130,7 +130,7 @@
         auto e = v.values[0];
         if (!e)
           throw new Exception("lang_code variable in "~fileName~" has no value set.");
-        if (auto str = Cast!(StringLiteralsExpression)(e))
+        if (auto str = Cast!(StringExpression)(e))
             GlobalSettings.language = str.getString();
       }
     }
diff -r f7bb892d64c2 -r ff1d11c27061 trunk/src/dil/SyntaxTree.d
--- a/trunk/src/dil/SyntaxTree.d	Sat Sep 22 14:58:44 2007 +0200
+++ b/trunk/src/dil/SyntaxTree.d	Sat Sep 22 15:32:08 2007 +0200
@@ -159,12 +159,12 @@
   NullExpression,
   DollarExpression,
   BoolExpression,
-  IntNumberExpression,
-  RealNumberExpression,
-  CharLiteralExpression,
-  StringLiteralsExpression,
+  IntExpression,
+  RealExpression,
+  CharExpression,
+  StringExpression,
   ArrayLiteralExpression,
-  AssocArrayLiteralExpression,
+  AArrayLiteralExpression,
   AssertExpression,
   MixinExpression,
   ImportExpression,