Support nested static array literal construction in ExpressionsToStat…

…icArray
dlang · Sep 4, 2015 · 6c38d9e · 6c38d9e
1 parent 28a6a51
commit 6c38d9e
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/e2ir.c b/src/e2ir.c
@@ -5134,6 +5134,18 @@ elem *toElem(Expression *e, IRState *irs)
             for (size_t i = 0; i < dim; i++)
             {
                 Expression *el = (*exps)[i];
+                if (el->op == TOKarrayliteral &&
+                    el->type->toBasetype()->ty == Tsarray)
+                {
+                    ArrayLiteralExp *ale = (ArrayLiteralExp *)el;
+                    if (ale->elements && ale->elements->dim)
+                    {
+                        elem *ex = ExpressionsToStaticArray(
+                            ale->loc, ale->elements, &stmp, offset + i * szelem);
+                        e = el_combine(e, ex);
+                    }
+                    continue;
+                }
 
                 /* Generate: *(&stmp + i * szelem) = element[i]
                  */