DMD 2.032 Merge.

dmd2/init.c

@@ -412,15 +412,24 @@ Expression *ArrayInitializer::toExpression()
 
 	   case Tpointer:
 	   case Tarray:
-	       edim = dim;
-	       break;
+		edim = dim;
+		break;
 
 	   default:
 	       assert(0);
 	}
     }
     else
+    {
 	edim = value.dim;
+	for (size_t i = 0, j = 0; i < value.dim; i++, j++)
+	{
+	    if (index.data[i])
+		j = ((Expression *)index.data[i])->toInteger();
+	    if (j >= edim)
+		edim = j + 1;
+	}
+    }
 
     elements = new Expressions();
     elements->setDim(edim);
@@ -464,7 +473,7 @@ Expression *ArrayInitializer::toExpression()
 Lno:
     delete elements;
     error(loc, "array initializers as expressions are not allowed");
-    return NULL;
+    return new ErrorExp();
 }