D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-11 18:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed appending function literals to an array

Browse Source
This commit is contained in:
Alexey Prokhin
2012-04-21 11:13:19 +04:00
parent 2f60c4dcda
commit 1bd4e725e8
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gen/toir.cpp
View File

@@ -2589,30 +2589,28 @@ DValue* CatAssignExp::toElem(IRState* p)
DValue* l = e1->toElem(p);
Type* e1type = e1->type->toBasetype();
assert(e1type->ty == Tarray);
Type* elemtype = e1type->nextOf()->toBasetype();
Type* e2type = e2->type->toBasetype();
if (e2type == elemtype) {
DtoCatAssignElement(loc, e1type, l, e2);
if (e1type->ty == Tarray && e2type->ty == Tdchar &&
(elemtype->ty == Tchar || elemtype->ty == Twchar))
{
if (elemtype->ty == Tchar)
// append dchar to char[]
DtoAppendDCharToString(l, e2);
else /*if (elemtype->ty == Twchar)*/
// append dchar to wchar[]
DtoAppendDCharToUnicodeString(l, e2);
}
else if (e1type == e2type) {
else if (e1type->equals(e2type)) {
// apeend array
DSliceValue* slice = DtoCatAssignArray(l,e2);
DtoAssign(loc, l, slice);
}
else if (elemtype->ty == Tchar) {
if (e2type->ty == Tdchar)
DtoAppendDCharToString(l, e2);
else
assert(0 && "cannot append the element to a string");
}
else if (elemtype->ty == Twchar) {
if (e2type->ty == Tdchar)
DtoAppendDCharToUnicodeString(l, e2);
else
assert(0 && "cannot append the element to an unicode string");
}
else {
assert(0 && "only one element at a time right now");
// append element
DtoCatAssignElement(loc, e1type, l, e2);
}
return l;