Changeset 1605:1d5721f9ae18

Timestamp:

01/06/10 13:18:19 (2 years 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) (4 diffs)

dmd/expression.c

@@ -8421 +8421 @@
-    e2->rvalue();
-
+    Type *tb1next = tb1->nextOf();
+
-    if ((tb1->ty == Tarray) &&
-    (tb2->ty == Tarray || tb2->ty == Tsarray) &&
-
-
+
+
+
+
+
-       )
-    {   // Append array
@@ -8432 +8437 @@
-    }
-    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;
@@ -8464 +8481 @@
-    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)
@@ -8531 +8557 @@
-    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)