Changeset 780

Timestamp:

12/05/10 08:27:04 (14 years ago)

Author:

walter

Message:

bugzilla 5214 Compiler crash with array of empty {}

Files:

• trunk/src/declaration.c (modified) (1 diff)

trunk/src/declaration.c

@@ -732 +732 @@
-
-    /* Pick up storage classes from context, but skip synchronized
-     */
-    storage_class |= (sc->stc & ~STCsynchronized);
-    if (storage_class & STCextern && init)
-        error("extern symbols cannot have initializers");
-
-    /* If auto type inference, do the inference
-     */
-    int inferred = 0;
-    if (!type)
-    {   inuse++;
-
-        ArrayInitializer *ai = init->isArrayInitializer();
-        if (ai)
-        {   Expression *e;
-            if (ai->isAssociativeArray())
-                e = ai->toAssocArrayLiteral();
-            else
-                e = init->toExpression();
+            if (!e)
+            {
+                error("cannot infer type from initializer");
+                e = new ErrorExp();
+            }
-            init = new ExpInitializer(e->loc, e);
-            type = init->inferType(sc);
-            if (type->ty == Tsarray)
-                type = type->nextOf()->arrayOf();
-        }
-        else
-            type = init->inferType(sc);
-
-//printf("test2: %s, %s, %s\n", toChars(), type->toChars(), type->deco);
-//      type = type->semantic(loc, sc);
-
-        inuse--;
-        inferred = 1;
-
-        if (init->isArrayInitializer() && type->toBasetype()->ty == Tsarray)
-        {   // Prefer array literals to give a T[] type rather than a T[dim]
-            type = type->toBasetype()->nextOf()->arrayOf();
-        }
-
-        /* This is a kludge to support the existing syntax for RAII