Changeset 1605:1d5721f9ae18

Timestamp:

01/06/10 13:18:19 (8 months ago)

Author:

Leandro Lucarella <llucax@gmail.com>

branch:

default

Message:

[WIP] Merge DMD r251: bugzilla 111 (appending a dchar to a char[])
This patch needs some work in the code generation, because of the runtime
changes (functions "_d_arrayappendcd" and "_d_arrayappendwd" are added).

This doesn't affect existing code though, it just makes with patch
a little useless, because something like this:

char [] s;
s ~= '\u6211';

That failed to compile with a nice error message previously to this
change, now fails with and ugly error message (a failed assertion).

Apparently there is a regression introduced by this patch too, when
compiling Dil I get this assertion message:

ldc: /home/luca/tesis/ldc/gen/statements.cpp:132: virtual void ReturnStatement::toIR(IRState*): Assertion `p->topfunc()->getReturnType() == llvm::Type::getVoidTy(gIR->context())' failed.
0 ldc 0x08a91628

Thank god we have bisecting capabilities in VCSs now ;)
---

dmd/expression.c | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)

Files:

dmd/expression.c (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

dmd/expression.c

--- Revision 1604:2afcaab30a6a
+++ Revision 1605:1d5721f9ae18
     e2 = resolveProperties(sc, e2);
     e = op_overload(sc);
     if (e)
     return e;
     if (e1->op == TOKslice)
     {   SliceExp *se = (SliceExp *)e1;
     if (se->e1->type->toBasetype()->ty == Tsarray)
         error("cannot append to static array %s", se->e1->type->toChars());
+    }
     e1 = e1->modifiableLvalue(sc, e1);
     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) &&
-    e2->implicitConvTo(e1->type)
+    (e2->implicitConvTo(e1->type)
-    //e1->type->next->equals(e2->type->next)
+#if DMDV2
+     || tb2->nextOf()->implicitConvTo(tb1next)
+#endif
+    )
+       )
     {   // Append array
     e2 = e2->castTo(sc, e1->type);
     type = e1->type;
     e = this;
+    }
     else if ((tb1->ty == Tarray) &&
-    e2->implicitConvTo(tb1->nextOf())
+    e2->implicitConvTo(tb1next)
+       )
     {   // Append element
-    e2 = e2->castTo(sc, tb1->nextOf());
+    e2 = e2->castTo(sc, tb1next);
     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());
-    type = Type::tint32;
+    e = new ErrorExp();
+    e = this;
+    }
     return e;
+}
 /************************************************************/
 MulAssignExp::MulAssignExp(Loc loc, Expression *e1, Expression *e2)
     : BinExp(loc, TOKmulass, sizeof(MulAssignExp), e1, e2)
+{
+}
 Expression *MulAssignExp::semantic(Scope *sc)
 {   Expression *e;
     BinExp::semantic(sc);
     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;
     return arrayOp(sc);
+    }
     e1 = e1->modifiableLvalue(sc, e1);
     e1->checkScalar();
     e1->checkNoBool();
     type = e1->type;
     typeCombine(sc);
     e1->checkArithmetic();
     e2->checkArithmetic();
     checkComplexMulAssign();
     if (e2->type->isfloating())
     {   Type *t1;
     Type *t2;
 …
+    }
     return this;
+}
 /************************************************************/
 DivAssignExp::DivAssignExp(Loc loc, Expression *e1, Expression *e2)
     : BinExp(loc, TOKdivass, sizeof(DivAssignExp), e1, e2)
+{
+}
 Expression *DivAssignExp::semantic(Scope *sc)
 {   Expression *e;
     BinExp::semantic(sc);
     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;
     return arrayOp(sc);
+    }
     e1 = e1->modifiableLvalue(sc, e1);
     e1->checkScalar();
     e1->checkNoBool();
     type = e1->type;
     typeCombine(sc);
     e1->checkArithmetic();
     e2->checkArithmetic();
     checkComplexMulAssign();
     if (e2->type->isimaginary())
     {   Type *t1;
     Type *t2;

Navigation

Changeset 1605:1d5721f9ae18

Legend:

dmd/expression.c

Download in other formats: