Changeset 1604:2afcaab30a6a

Timestamp:

01/06/10 13:18:19 (2 years ago)

Author:

Leandro Lucarella <llucax@gmail.com>

branch:

default

Message:

Merge DMD r250: harmonize
---

dmd/expression.c | 133 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 95 insertions(+), 38 deletions(-)

Files:

• dmd/expression.c (modified) (4 diffs)

dmd/expression.c

@@ -462 +462 @@
-    }
-    }
+}
+
+Expressions *arrayExpressionToCommonType(Scope *sc, Expressions *exps, Type **pt)
+{
+#if DMDV1
+    /* The first element sets the type
+     */
+    Type *t0 = NULL;
+    for (size_t i = 0; i < exps->dim; i++)
+    {   Expression *e = (Expression *)exps->data[i];
+
+    if (!e->type)
+    {   error("%s has no value", e->toChars());
+        e = new ErrorExp();
+    }
+    e = resolveProperties(sc, e);
+
+    if (!t0)
+        t0 = e->type;
+    else
+        e = e->implicitCastTo(sc, t0);
+    exps->data[i] = (void *)e;
+    }
+
+    if (!t0)
+    t0 = Type::tvoid;
+    if (pt)
+    *pt = t0;
+
+    // Eventually, we want to make this copy-on-write
+    return exps;
+#endif
+#if DMDV2
+    /* The type is determined by applying ?: to each pair.
+     */
+    IntegerExp integerexp(0);
+    CondExp condexp(0, &integerexp, NULL, NULL);
+
+    Type *t0 = NULL;
+    Expression *e0;
+    int j0;
+    for (size_t i = 0; i < exps->dim; i++)
+    {   Expression *e = (Expression *)exps->data[i];
+
+    e = resolveProperties(sc, e);
+    if (!e->type)
+    {   error("%s has no value", e->toChars());
+        e = new ErrorExp();
+    }
+
+    if (t0)
+    {   if (t0 != e->type)
+        {
+        /* This applies ?: to merge the types. It's backwards;
+         * ?: should call this function to merge types.
+         */
+        condexp.type = NULL;
+        condexp.e1 = e0;
+        condexp.e2 = e;
+        condexp.semantic(sc);
+        exps->data[j0] = (void *)condexp.e1;
+        e = condexp.e2;
+        t0 = e->type;
+        }
+    }
+    else
+    {   j0 = i;
+        e0 = e;
+        t0 = e->type;
+    }
+    exps->data[i] = (void *)e;
+    }
+
+    if (t0)
+    {
+    for (size_t i = 0; i < exps->dim; i++)
+    {   Expression *e = (Expression *)exps->data[i];
+        e = e->implicitCastTo(sc, t0);
+        exps->data[i] = (void *)e;
+    }
+    }
+    else
+    t0 = Type::tvoid;       // [] is typed as void[]
+    if (pt)
+    *pt = t0;
+
+    // Eventually, we want to make this copy-on-write
+    return exps;
+#endif
-}
-
@@ -2985 +3074 @@
-Expression *AssocArrayLiteralExp::semantic(Scope *sc)
-{   Expression *e;
-    Type *tkey = NULL;
-    Type *tvalue = NULL;
-
-#if LOGSEMANTIC
@@ -2993 +3080 @@
-
-    // Run semantic() on each element
-
-
-
-
-
-
-
-
-
-
+
+
-    expandTuples(keys);
-    expandTuples(values);
@@ -3011 +3090 @@
-    values->setDim(0);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    type = new TypeAArray(tvalue, tkey);
-    type = type->semantic(loc, sc);