Changeset 251

Timestamp:

11/18/09 01:54:37 (10 months ago)

Author:

walter

Message:

bugzilla 111

Files:

• branches/dmd-1.x/src/backend/rtlsym.h (modified) (1 diff)
• branches/dmd-1.x/src/e2ir.c (modified) (1 diff)
• branches/dmd-1.x/src/expression.c (modified) (3 diffs)
• trunk/src/backend/rtlsym.h (modified) (1 diff)
• trunk/src/e2ir.c (modified) (2 diffs)
• trunk/src/expression.c (modified) (6 diffs)

branches/dmd-1.x/src/backend/rtlsym.h

@@ -91 +91 @@
-SYMBOL_MARS(FATEXIT,       FLfunc,FREGSAVED,"_fatexit", 0, t) \
-SYMBOL_MARS(ARRAYCATT,     FLfunc,FREGSAVED,"_d_arraycatT", 0, t) \
-SYMBOL_MARS(ARRAYCATNT,    FLfunc,FREGSAVED,"_d_arraycatnT", 0, t) \
-SYMBOL_MARS(ARRAYAPPENDT,  FLfunc,FREGSAVED,"_d_arrayappendT", 0, t) \
-SYMBOL_MARS(ARRAYAPPENDCT,  FLfunc,FREGSAVED,"_d_arrayappendcT", 0, t) \
+SYMBOL_MARS(ARRAYAPPENDCD,  FLfunc,FREGSAVED,"_d_arrayappendcd", 0, t) \
+SYMBOL_MARS(ARRAYAPPENDWD,  FLfunc,FREGSAVED,"_d_arrayappendwd", 0, t) \
-SYMBOL_MARS(ARRAYSETLENGTHT,FLfunc,FREGSAVED,"_d_arraysetlengthT", 0, t) \
-SYMBOL_MARS(ARRAYSETLENGTHIT,FLfunc,FREGSAVED,"_d_arraysetlengthiT", 0, t) \
-SYMBOL_MARS(ARRAYCOPY,     FLfunc,FREGSAVED,"_d_arraycopy", 0, t) \
-SYMBOL_MARS(ARRAYASSIGN,   FLfunc,FREGSAVED,"_d_arrayassign", 0, t) \
-SYMBOL_MARS(ARRAYCTOR,     FLfunc,FREGSAVED,"_d_arrayctor", 0, t) \

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

@@ -2629 +2629 @@
-    //printf("CatAssignExp::toElem('%s')\n", toChars());
-    elem *e;
-    Type *tb1 = e1->type->toBasetype();
-    Type *tb2 = e2->type->toBasetype();
-
-
-
-
-
-
-
+
+
+
+
+
-    e1 = el_una(OPaddr, TYnptr, e1);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        e2 = el_una(OPstrpar, TYstruct, e2);
-        e2->Enumbytes = e2->E1->Enumbytes;
-        assert(e2->Enumbytes);
-    }
-
-    Type *tb1n = tb1->nextOf()->toBasetype();
-    if ((tb2->ty == Tarray || tb2->ty == Tsarray) &&
-        tb1n->equals(tb2->nextOf()->toBasetype()))
-    {   // Append array
-
-
+
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPENDT]), ep);
-#else
-        ep = el_params(el_long(TYint, tb1n->size()), e2, e1, NULL);
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPEND]), ep);
-#endif
-    }
-    else
-    {   // Append element
-
-
+
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPENDCT]), ep);
-#else
-        ep = el_params(e2, el_long(TYint, tb1n->size()), e1, NULL);
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPENDC]), ep);
-#endif
-    }
-    el_setLoc(e,loc);
-    }
-    else
-    assert(0);

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

@@ -8370 +8370 @@
-    Type *tb1 = e1->type->toBasetype();
-    Type *tb2 = e2->type->toBasetype();
-
-    e2->rvalue();
-
+    Type *tb1next = tb1->nextOf();
+
-    if ((tb1->ty == Tarray) &&
-    (tb2->ty == Tarray || tb2->ty == Tsarray) &&
-
-
+
+
+
+
+
-       )
-    {   // Append array
-    e2 = e2->castTo(sc, e1->type);
-    type = e1->type;
-    e = this;
-    }
-    else if ((tb1->ty == Tarray) &&
-->nextOf()
+next
-       )
-    {   // Append element
-->nextOf()
+next
-    type = e1->type;
-    e = this;
-    }
+    else if (tb1->ty == Tarray &&
+    (tb1next->ty == Tchar || tb1next->ty == Twchar) &&
+    e2->implicitConvTo(Type::tdchar)
+       )
+    {   // Append dchar to char[] or wchar[]
+    e2 = e2->castTo(sc, Type::tdchar);
+    type = e1->type;
+    e = this;
+
+    /* Do not allow appending wchar to char[] because if wchar happens
+     * to be a surrogate pair, nothing good can result.
+     */
+    }
-    else
-    {
-    error("cannot append type %s to type %s", tb2->toChars(), tb1->toChars());
-
-
+
-    }
-    return e;
-}
-
-/************************************************************/
@@ -8413 +8430 @@
-    e2 = resolveProperties(sc, e2);
-
-    e = op_overload(sc);
-    if (e)
-    return e;
+
+#if DMDV2
+    if (e1->op == TOKarraylength)
+    {
+    e = ArrayLengthExp::rewriteOpAssign(this);
+    e = e->semantic(sc);
+    return e;
+    }
+#endif
-
-    if (e1->op == TOKslice)
-    {   // T[] -= ...
-    typeCombine(sc);
-    type = e1->type;
@@ -8477 +8503 @@
-    e2 = resolveProperties(sc, e2);
-
-    e = op_overload(sc);
-    if (e)
-    return e;
+
+#if DMDV2
+    if (e1->op == TOKarraylength)
+    {
+    e = ArrayLengthExp::rewriteOpAssign(this);
+    e = e->semantic(sc);
+    return e;
+    }
+#endif
-
-    if (e1->op == TOKslice)
-    {   // T[] -= ...
-    typeCombine(sc);
-    type = e1->type;

trunk/src/backend/rtlsym.h

@@ -91 +91 @@
-SYMBOL_MARS(FATEXIT,       FLfunc,FREGSAVED,"_fatexit", 0, t) \
-SYMBOL_MARS(ARRAYCATT,     FLfunc,FREGSAVED,"_d_arraycatT", 0, t) \
-SYMBOL_MARS(ARRAYCATNT,    FLfunc,FREGSAVED,"_d_arraycatnT", 0, t) \
-SYMBOL_MARS(ARRAYAPPENDT,  FLfunc,FREGSAVED,"_d_arrayappendT", 0, t) \
-SYMBOL_MARS(ARRAYAPPENDCT,  FLfunc,FREGSAVED,"_d_arrayappendcT", 0, t) \
+SYMBOL_MARS(ARRAYAPPENDCD,  FLfunc,FREGSAVED,"_d_arrayappendcd", 0, t) \
+SYMBOL_MARS(ARRAYAPPENDWD,  FLfunc,FREGSAVED,"_d_arrayappendwd", 0, t) \
-SYMBOL_MARS(ARRAYSETLENGTHT,FLfunc,FREGSAVED,"_d_arraysetlengthT", 0, t) \
-SYMBOL_MARS(ARRAYSETLENGTHIT,FLfunc,FREGSAVED,"_d_arraysetlengthiT", 0, t) \
-SYMBOL_MARS(ARRAYCOPY,     FLfunc,FREGSAVED,"_d_arraycopy", 0, t) \
-SYMBOL_MARS(ARRAYASSIGN,   FLfunc,FREGSAVED,"_d_arrayassign", 0, t) \
-SYMBOL_MARS(ARRAYCTOR,     FLfunc,FREGSAVED,"_d_arrayctor", 0, t) \

trunk/src/e2ir.c

@@ -2913 +2913 @@
-    //printf("CatAssignExp::toElem('%s')\n", toChars());
-    elem *e;
-    Type *tb1 = e1->type->toBasetype();
-    Type *tb2 = e2->type->toBasetype();
-
-
-
-
-
-
-
+
+
+
+
+
-    e1 = el_una(OPaddr, TYnptr, e1);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (tybasic(e2->Ety) == TYstruct || tybasic(e2->Ety) == TYarray)
-    {
-        e2 = el_una(OPstrpar, TYstruct, e2);
-        e2->Enumbytes = e2->E1->Enumbytes;
-        assert(e2->Enumbytes);
@@ -2933 +2946 @@
-
-    Type *tb1n = tb1->nextOf()->toBasetype();
-    if ((tb2->ty == Tarray || tb2->ty == Tsarray) &&
-        tb1n->equals(tb2->nextOf()->toBasetype()))
-    {   // Append array
-
-
+
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPENDT]), ep);
-#else
-        ep = el_params(el_long(TYint, tb1n->size()), e2, e1, NULL);
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPEND]), ep);
-#endif
-    }
-    else
-    {   // Append element
-
-
+
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPENDCT]), ep);
-#else
-        ep = el_params(e2, el_long(TYint, tb1n->size()), e1, NULL);
-        e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYAPPENDC]), ep);
-#endif
-    }
-    el_setLoc(e,loc);
-    }
-    else
-    assert(0);

trunk/src/expression.c

@@ -454 +454 @@
-    }
-}
-
-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;
-in
+size_
-    {   Expression *e = (Expression *)exps->data[i];
-
-    e = resolveProperties(sc, e);
-    if (!e->type)
-    {   error("%s has no value", e->toChars());
@@ -494 +525 @@
-    exps->data[i] = (void *)e;
-    }
-
-    if (t0)
-    {
-in
+size_
-    {   Expression *e = (Expression *)exps->data[i];
-        e = e->implicitCastTo(sc, t0);
-        exps->data[i] = (void *)e;
-    }
-    }
@@ -507 +538 @@
-    if (pt)
-    *pt = t0;
-
-    // Eventually, we want to make this copy-on-write
-    return exps;
+#endif
-}
-
-/****************************************
- * Preprocess arguments to function.
- */
@@ -8888 +8920 @@
-    Type *tb1 = e1->type->toBasetype();
-    Type *tb2 = e2->type->toBasetype();
-
-    e2->rvalue();
-
+    Type *tb1next = tb1->nextOf();
+
-    if ((tb1->ty == Tarray) &&
-    (tb2->ty == Tarray || tb2->ty == Tsarray) &&
-
-
+
+
+
+
+
-       )
-    {   // Append array
-    e2 = e2->castTo(sc, e1->type);
-    type = e1->type;
-    e = this;
-    }
-    else if ((tb1->ty == Tarray) &&
-->nextOf()
+next
-       )
-    {   // Append element
-->nextOf()
+next
-    type = e1->type;
-    e = this;
-    }
+    else if (tb1->ty == Tarray &&
+    (tb1next->ty == Tchar || tb1next->ty == Twchar) &&
+    e2->implicitConvTo(Type::tdchar)
+       )
+    {   // Append dchar to char[] or wchar[]
+    e2 = e2->castTo(sc, Type::tdchar);
+    type = e1->type;
+    e = this;
+
+    /* Do not allow appending wchar to char[] because if wchar happens
+     * to be a surrogate pair, nothing good can result.
+     */
+    }
-    else
-    {
-    error("cannot append type %s to type %s", tb2->toChars(), tb1->toChars());
-
-
+
-    }
-    return e;
-}
-
-/************************************************************/
@@ -8932 +8981 @@
-
-    e = op_overload(sc);
-    if (e)
-    return e;
-
+#if DMDV2
-    if (e1->op == TOKarraylength)
-    {
-    e = ArrayLengthExp::rewriteOpAssign(this);
-    e = e->semantic(sc);
-    return e;
-    }
+#endif
-
-    if (e1->op == TOKslice)
-    {   // T[] -= ...
-    typeCombine(sc);
-    type = e1->type;
@@ -9003 +9054 @@
-
-    e = op_overload(sc);
-    if (e)
-    return e;
-
+#if DMDV2
-    if (e1->op == TOKarraylength)
-    {
-    e = ArrayLengthExp::rewriteOpAssign(this);
-    e = e->semantic(sc);
-    return e;
-    }
+#endif
-
-    if (e1->op == TOKslice)
-    {   // T[] -= ...
-    typeCombine(sc);
-    type = e1->type;