merge D2 pull #992

dlang · Jun 11, 2012 · 0963937 · 0963937
1 parent 6a0269c
commit 0963937
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/parse.c b/src/parse.c
@@ -2742,7 +2742,15 @@ Initializer *Parser::parseInitializer()
                         if (comma == 1)
                             error("comma expected separating array initializers, not %s", token.toChars());
                         value = parseInitializer();
-                        ia->addInit(NULL, value);
+                        if (token.value == TOKcolon)
+                        {
+                            nextToken();
+                            e = value->toExpression();
+                            value = parseInitializer();
+                        }
+                        else
+                            e = NULL;
+                        ia->addInit(e, value);
                         comma = 1;
                         continue;