# HG changeset patch
# User Aziz K?ksal <aziz.koeksal@gmail.com>
# Date 1201040583 -3600
# Node ID 170ddcdc9711563232e619410b3ff2b4cc4fce7e
# Parent  19a34b69cc7dbf76f9d6a2b02c70a0c07ae4746a
Renamed VoidInitializer, ArrayInitializer and StructInitializer.

diff -r 19a34b69cc7d -r 170ddcdc9711 trunk/src/cmd/Generate.d
--- a/trunk/src/cmd/Generate.d	Tue Jan 22 20:56:10 2008 +0100
+++ b/trunk/src/cmd/Generate.d	Tue Jan 22 23:23:03 2008 +0100
@@ -103,15 +103,7 @@
     suffixLength = "Statement".length;
     break;
   case NC.Expression:
-    switch (node.kind)
-    {
-    case NodeKind.VoidInitializer,
-         NodeKind.ArrayInitializer,
-         NodeKind.StructInitializer:
-      break;
-    default:
-     suffixLength = "Expression".length;
-    }
+    suffixLength = "Expression".length;
     break;
   case NC.Type:
     suffixLength = "Type".length;
diff -r 19a34b69cc7d -r 170ddcdc9711 trunk/src/dil/SettingsLoader.d
--- a/trunk/src/dil/SettingsLoader.d	Tue Jan 22 20:56:10 2008 +0100
+++ b/trunk/src/dil/SettingsLoader.d	Tue Jan 22 23:23:03 2008 +0100
@@ -42,7 +42,7 @@
         GlobalSettings.langFile = val.getString();
       break;
     case "import_paths":
-      if (auto array = e.Is!(ArrayInitializer))
+      if (auto array = e.Is!(ArrayInitExpression))
       {
         foreach (value; array.values)
           if (auto str = value.Is!(StringExpression))
@@ -90,7 +90,7 @@
     switch (variableName)
     {
     case "messages":
-      if (auto array = e.Is!(ArrayInitializer))
+      if (auto array = e.Is!(ArrayInitExpression))
       {
         foreach (value; array.values)
         {
diff -r 19a34b69cc7d -r 170ddcdc9711 trunk/src/dil/ast/DefaultVisitor.d
--- a/trunk/src/dil/ast/DefaultVisitor.d	Tue Jan 22 20:56:10 2008 +0100
+++ b/trunk/src/dil/ast/DefaultVisitor.d	Tue Jan 22 23:23:03 2008 +0100
@@ -182,10 +182,10 @@
       static if (is(E == TraitsExpression))
         visitN(e.targs);
       // VoidInitializer has no subnodes.
-      static if (is(E == ArrayInitializer))
+      static if (is(E == ArrayInitExpression))
         foreach (i, key; e.keys)
           key && visitE(key), visitE(e.values[i]);
-      static if (is(E == StructInitializer))
+      static if (is(E == StructInitExpression))
         foreach (value; e.values)
           visitE(value);
     }
diff -r 19a34b69cc7d -r 170ddcdc9711 trunk/src/dil/ast/Expressions.d
--- a/trunk/src/dil/ast/Expressions.d	Tue Jan 22 20:56:10 2008 +0100
+++ b/trunk/src/dil/ast/Expressions.d	Tue Jan 22 23:23:03 2008 +0100
@@ -960,7 +960,7 @@
 }
 // }
 
-class VoidInitializer : Expression
+class VoidInitExpression : Expression
 {
   this()
   {
@@ -968,7 +968,7 @@
   }
 }
 
-class ArrayInitializer : Expression
+class ArrayInitExpression : Expression
 {
   Expression[] keys;
   Expression[] values;
@@ -986,7 +986,7 @@
   }
 }
 
-class StructInitializer : Expression
+class StructInitExpression : Expression
 {
   Identifier*[] idents;
   Expression[] values;
diff -r 19a34b69cc7d -r 170ddcdc9711 trunk/src/dil/ast/NodesEnum.d
--- a/trunk/src/dil/ast/NodesEnum.d	Tue Jan 22 20:56:10 2008 +0100
+++ b/trunk/src/dil/ast/NodesEnum.d	Tue Jan 22 23:23:03 2008 +0100
@@ -171,9 +171,9 @@
   "ParenExpression",
   "FunctionLiteralExpression",
   "TraitsExpression", // D2.0
-  "VoidInitializer",
-  "ArrayInitializer",
-  "StructInitializer",
+  "VoidInitExpression",
+  "ArrayInitExpression",
+  "StructInitExpression",
   "AsmTypeExpression",
   "AsmOffsetExpression",
   "AsmSegExpression",
diff -r 19a34b69cc7d -r 170ddcdc9711 trunk/src/dil/parser/Parser.d
--- a/trunk/src/dil/parser/Parser.d	Tue Jan 22 20:56:10 2008 +0100
+++ b/trunk/src/dil/parser/Parser.d	Tue Jan 22 23:23:03 2008 +0100
@@ -528,9 +528,8 @@
     Identifier*[] idents = [ident];
     Expression[] values;
     goto LenterLoop; // We've already parsed an identifier. Jump to if statement and check for initializer.
-    while (token.kind == T.Comma)
+    while (skipped(T.Comma))
     {
-      nT();
       idents ~= requireIdentifier(MSG.ExpectedVariableName);
     LenterLoop:
       if (skipped(T.Assign))
@@ -555,7 +554,7 @@
       if (next == T.Comma || next == T.Semicolon)
       {
         nT();
-        return set(new VoidInitializer(), begin);
+        return set(new VoidInitExpression(), begin);
       }
     }
     return parseNonVoidInitializer();
@@ -594,7 +593,7 @@
         nT();
       }
       require(T.RBracket);
-      init = new ArrayInitializer(keys, values);
+      init = new ArrayInitExpression(keys, values);
       break;
     case T.LBrace:
       // StructInitializer:
@@ -626,7 +625,7 @@
           nT();
         }
         require(T.RBrace);
-        return new StructInitializer(idents, values);
+        return new StructInitExpression(idents, values);
       }
 
       bool success;