Changeset 657

Timestamp:

07/02/07 18:12:57 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 1.015

Files:

• branches/dmdfe/cast.c (modified) (2 diffs)
• branches/dmdfe/declaration.c (modified) (1 diff)
• branches/dmdfe/expression.c (modified) (2 diffs)
• branches/dmdfe/init.c (modified) (1 diff)
• branches/dmdfe/init.h (modified) (3 diffs)
• branches/dmdfe/interpret.c (modified) (4 diffs)
• branches/dmdfe/mars.c (modified) (1 diff)
• branches/dmdfe/parse.c (modified) (1 diff)
• branches/dmdfe/statement.c (modified) (1 diff)

branches/dmdfe/cast.c

@@ -333 +333 @@
-{   MATCH m;
-
-
+
+
+
+
-    if (!committed)
-    {
@@ -351 +354 @@
-            ((TypeSArray *)t)->dim->toInteger())
-            return MATCHnomatch;
+            goto L1;
-        case Tarray:
+            goto L1;
-        case Tpointer:
+        L1:
-            if (t->next->ty == Tchar)
-            return MATCHexact;

branches/dmdfe/declaration.c

@@ -802 +802 @@
-    if (init)
-    {
+    ArrayInitializer *ai = init->isArrayInitializer();
+    if (ai && type->toBasetype()->ty == Taarray)
+    {
+        init = ai->toAssocArrayInitializer();
+    }
+
-    ExpInitializer *ei = init->isExpInitializer();
-

branches/dmdfe/expression.c

@@ -2460 +2460 @@
-        error("%s has no value", e->toChars());
-    e = resolveProperties(sc, e);
+
+    unsigned char committed = 1;
+    if (e->op == TOKstring)
+        committed = ((StringExp *)e)->committed;
+
-    if (!t0)
-    {   t0 = e->type;
@@ -2471 +2476 @@
-    else
-        e = e->implicitCastTo(sc, t0);
+    if (!committed && e->op == TOKstring)
+    {   StringExp *se = (StringExp *)e;
+        se->committed = 0;
+    }
-    elements->data[i] = (void *)e;
-    }

branches/dmdfe/init.c

@@ -387 +387 @@
-
-
+/********************************
+ * If possible, convert array initializer to associative array initializer.
+ */
+
+Initializer *ArrayInitializer::toAssocArrayInitializer()
+{   Expressions *keys;
+    Expressions *values;
+    Expression *e;
+
+    //printf("ArrayInitializer::toAssocArrayInitializer()\n");
+    //static int i; if (++i == 2) halt();
+    keys = new Expressions();
+    keys->setDim(value.dim);
+    values = new Expressions();
+    values->setDim(value.dim);
+
+    for (size_t i = 0; i < value.dim; i++)
+    {
+    e = (Expression *)index.data[i];
+    if (!e)
+        goto Lno;
+    keys->data[i] = (void *)e;
+
+    Initializer *iz = (Initializer *)value.data[i];
+    if (!iz)
+        goto Lno;
+    e = iz->toExpression();
+    if (!e)
+        goto Lno;
+    values->data[i] = (void *)e;
+    }
+    e = new AssocArrayLiteralExp(loc, keys, values);
+    return new ExpInitializer(loc, e);
+
+Lno:
+    delete keys;
+    delete values;
+    error(loc, "not an associative array initializer");
+    return this;
+}
+
+
-Type *ArrayInitializer::inferType(Scope *sc)
-{

branches/dmdfe/init.h

@@ -24 +24 @@
-struct AggregateDeclaration;
-struct VoidInitializer;
+struct ArrayInitializer;
-struct ExpInitializer;
-#ifdef _DH
@@ -44 +45 @@
-
-    virtual VoidInitializer *isVoidInitializer() { return NULL; }
+    virtual ArrayInitializer  *isArrayInitializer()  { return NULL; }
-    virtual ExpInitializer  *isExpInitializer()  { return NULL; }
-};
@@ -90 +92 @@
-    Type *inferType(Scope *sc);
-    Expression *toExpression();
+    Initializer *toAssocArrayInitializer();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    dt_t *toDtBit();    // for bit arrays
+
+    ArrayInitializer *isArrayInitializer() { return this; }
-};
-

branches/dmdfe/interpret.c

@@ -859 +859 @@
-}
-
-VarDeclaration *v
+Declaration *d
-{
-    Expression *e = EXP_CANT_INTERPRET;
+    VarDeclaration *v = d->isVarDeclaration();
+    SymbolDeclaration *s = d->isSymbolDeclaration();
-    if (v)
-    {
@@ -879 +881 @@
-        e = EXP_CANT_INTERPRET;
-    }
+    else if (s)
+    {
+    /* if (s->dsym->toInitializer() == s->sym)
+    {   Expressions *exps = new Expressions();
+        e = new StructLiteralExp(0, s->dsym, exps);
+        e = e->semantic(NULL);
+    } */
+    }
-    return e;
-}
@@ -887 +897 @@
-    printf("VarExp::interpret() %s\n", toChars());
-#endif
-->isVarDeclaration()
+
-}
-
@@ -1931 +1941 @@
-    }
-    }
+#if LOG
+    if (e == EXP_CANT_INTERPRET)
+    printf("PtrExp::interpret() %s = EXP_CANT_INTERPRET\n", toChars());
+#endif
-    return e;
-}

branches/dmdfe/mars.c

@@ -56 +56 @@
-    copyright = "Copyright (c) 1999-2007 by Digital Mars";
-    written = "written by Walter Bright";
-4
+5
-    global.structalign = 8;
-

branches/dmdfe/parse.c

@@ -767 +767 @@
-
-    nextToken();
-
-
+
+
+
+
+
-
-    f = new InvariantDeclaration(loc, 0);

branches/dmdfe/statement.c

@@ -814 +814 @@
-    condition = condition->semantic(sc);
-    condition = resolveProperties(sc, condition);
+    condition = condition->optimize(WANTvalue);
-    condition = condition->checkToBoolean();
-