Changeset 230

Timestamp:

11/01/09 04:09:34 (15 years ago)

Author:

walter

Message:

bugzilla 3422 and 3426

Files:

• branches/dmd-1.x/src/declaration.c (modified) (1 diff)
• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• trunk/src/declaration.c (modified) (1 diff)
• trunk/src/expression.c (modified) (1 diff)
• trunk/src/mars.c (modified) (1 diff)

branches/dmd-1.x/src/declaration.c

@@ -1090 +1090 @@
-                ei->exp = new CallExp(loc, eCall, ei->exp);
-            }
-            }
-        }
-        ei->exp = new AssignExp(loc, e1, ei->exp);
-        ei->exp->op = TOKconstruct;
-        canassign++;
-        ei->exp = ei->exp->semantic(sc);
-        canassign--;
-        ei->exp->optimize(WANTvalue);
-        }
-        else
-        {
-        init = init->semantic(sc, type);
-        if (fd && isConst() && !isStatic())
-        {   // Make it static
-            storage_class |= STCstatic;
-        }
-        }
-    }
-
+
+
-    {
-        /* Because we may need the results of a const declaration in a
-         * subsequent type, such as an array dimension, before semantic2()
-         * gets ordinarily run, try to run semantic2() now.
-         * Ignore failure.
-         */
-
-        if (!global.errors && !inferred)
-        {
-        unsigned errors = global.errors;
-        global.gag++;
-        //printf("+gag\n");
-        Expression *e;
-        Initializer *i2 = init;
-        inuse++;
-        if (ei)
-        {
-            e = ei->exp->syntaxCopy();
-            e = e->semantic(sc);
-            e = e->implicitCastTo(sc, type);

branches/dmd-1.x/src/expression.c

@@ -3136 +3136 @@
-
-    elements->data[i] = (void *)e;
-    }
-
-    /* Fill out remainder of elements[] with default initializers for fields[]
-     */
-    for (size_t i = elements->dim; i < sd->fields.dim; i++)
-    {   Dsymbol *s = (Dsymbol *)sd->fields.data[i];
-    VarDeclaration *v = s->isVarDeclaration();
-    assert(v);
-
-    if (v->offset < offset)
-    {   e = NULL;
-        sd->hasUnions = 1;
-    }
-    else
-    {
-        if (v->init)
-        {   e = v->init->toExpression();
-        if (!e)
-
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-        {   e = v->type->defaultInit();
-        e->loc = loc;
-        }
-        offset = v->offset + v->type->size();
-    }
-    elements->push(e);
-    }
-
-    type = sd->type;
-    return this;
-}
-
-/**************************************
- * Gets expression at offset of type.
- * Returns NULL if not found.
- */
-
-Expression *StructLiteralExp::getField(Type *type, unsigned offset)

trunk/src/declaration.c

@@ -1097 +1097 @@
-                !(ti->ty == Tstruct && t->toDsymbol(sc) == ti->toDsymbol(sc)))
-            {   // Rewrite as e1.call(arguments)
-                Expression * eCall = new DotIdExp(loc, e1, Id::call);
-                ei->exp = new CallExp(loc, eCall, ei->exp);
-            }
-            }
-        }
-        ei->exp = new AssignExp(loc, e1, ei->exp);
-        ei->exp->op = op;
-        canassign++;
-        ei->exp = ei->exp->semantic(sc);
-        canassign--;
-        ei->exp->optimize(WANTvalue);
-        }
-        else
-        {
-        init = init->semantic(sc, type);
-        }
-    }
-    else if (storage_class & (STCconst | STCimmutable | STCmanifest) ||
-
+
+
-    {
-        /* Because we may need the results of a const declaration in a
-         * subsequent type, such as an array dimension, before semantic2()
-         * gets ordinarily run, try to run semantic2() now.
-         * Ignore failure.
-         */
-
-        if (!global.errors && !inferred)
-        {
-        unsigned errors = global.errors;
-        global.gag++;
-        //printf("+gag\n");
-        Expression *e;
-        Initializer *i2 = init;
-        inuse++;
-        if (ei)
-        {
-            e = ei->exp->syntaxCopy();
-            e = e->semantic(sc);
-            e = e->implicitCastTo(sc, type);

trunk/src/expression.c

@@ -3258 +3258 @@
-    elements->data[i] = (void *)e;
-    }
-
-    /* Fill out remainder of elements[] with default initializers for fields[]
-     */
-    for (size_t i = elements->dim; i < nfields; i++)
-    {   Dsymbol *s = (Dsymbol *)sd->fields.data[i];
-    VarDeclaration *v = s->isVarDeclaration();
-    assert(v);
-    assert(!v->isThisDeclaration());
-
-    if (v->offset < offset)
-    {   e = NULL;
-        sd->hasUnions = 1;
-    }
-    else
-    {
-        if (v->init)
-        {   e = v->init->toExpression();
-        if (!e)
-
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-        {   e = v->type->defaultInit();
-        e->loc = loc;
-        }
-        offset = v->offset + v->type->size();
-    }
-    elements->push(e);
-    }
-
-    type = sd->type;
-    return this;
-}
-
-/**************************************
- * Gets expression at offset of type.
- * Returns NULL if not found.
- */
-
-Expression *StructLiteralExp::getField(Type *type, unsigned offset)

trunk/src/mars.c

@@ -151 +151 @@
-{
-    if (!global.gag)
-    {
-    char *p = loc.toChars();
-
-    if (*p)
-        fprintf(stdmsg, "%s: ", p);
-    mem.free(p);
-
-    fprintf(stdmsg, "Error: ");
-#if _MSC_VER
-    // MS doesn't recognize %zu format
-    OutBuffer tmp;
-    tmp.vprintf(format, ap);
-    fprintf(stdmsg, "%s", tmp.toChars());
-#else
-    vfprintf(stdmsg, format, ap);
-#endif
-    fprintf(stdmsg, "\n");
-    fflush(stdmsg);
-//
+
-    }
-    global.errors++;
-}
-
-/***************************************
- * Call this after printing out fatal error messages to clean up and exit
- * the compiler.
- */
-
-void fatal()
-{
-#if 0
-    halt();
-#endif
-    exit(EXIT_FAILURE);
-}
-
-/**************************************
- * Try to stop forgetting to remove the breakpoints from
- * release builds.