Mercurial > projects > ldc
view lphobos/typeinfo2/ti_Ashort.d @ 1605:1d5721f9ae18
[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(-)
author | Leandro Lucarella <llucax@gmail.com> |
---|---|
date | Wed, 06 Jan 2010 15:18:19 -0300 |
parents | 362825278842 |
children |
line wrap: on
line source
module typeinfo2.ti_Ashort; extern(C) int memcmp(void*,void*,size_t); // short[] class TypeInfo_As : TypeInfo { char[] toString() { return "short[]"; } hash_t getHash(void *p) { short[] s = *cast(short[]*)p; size_t len = s.length; short *str = s.ptr; hash_t hash = 0; while (1) { switch (len) { case 0: return hash; case 1: hash *= 9; hash += *cast(ushort *)str; return hash; default: hash *= 9; hash += *cast(uint *)str; str += 2; len -= 2; break; } } return hash; } int equals(void *p1, void *p2) { short[] s1 = *cast(short[]*)p1; short[] s2 = *cast(short[]*)p2; return s1.length == s2.length && memcmp(cast(void *)s1, cast(void *)s2, s1.length * short.sizeof) == 0; } int compare(void *p1, void *p2) { short[] s1 = *cast(short[]*)p1; short[] s2 = *cast(short[]*)p2; size_t len = s1.length; if (s2.length < len) len = s2.length; for (size_t u = 0; u < len; u++) { int result = s1[u] - s2[u]; if (result) return result; } return cast(int)s1.length - cast(int)s2.length; } size_t tsize() { return (short[]).sizeof; } uint flags() { return 1; } TypeInfo next() { return typeid(short); } } // ushort[] class TypeInfo_At : TypeInfo_As { char[] toString() { return "ushort[]"; } int compare(void *p1, void *p2) { ushort[] s1 = *cast(ushort[]*)p1; ushort[] s2 = *cast(ushort[]*)p2; size_t len = s1.length; if (s2.length < len) len = s2.length; for (size_t u = 0; u < len; u++) { int result = s1[u] - s2[u]; if (result) return result; } return cast(int)s1.length - cast(int)s2.length; } TypeInfo next() { return typeid(ushort); } } // wchar[] class TypeInfo_Au : TypeInfo_At { char[] toString() { return "wchar[]"; } TypeInfo next() { return typeid(wchar); } }