Mercurial > projects > ldc
view dmd/identifier.c @ 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 | e961851fb8be |
children |
line wrap: on
line source
// Compiler implementation of the D programming language // Copyright (c) 1999-2006 by Digital Mars // All Rights Reserved // written by Walter Bright // http://www.digitalmars.com // License for redistribution is by either the Artistic License // in artistic.txt, or the GNU General Public License in gnu.txt. // See the included readme.txt for details. #include <stdio.h> #include <string.h> #include "root.h" #include "identifier.h" #include "mars.h" #include "lexer.h" #include "id.h" Identifier::Identifier(const char *string, int value) { //printf("Identifier('%s', %d)\n", string, value); this->string = string; this->value = value; this->len = strlen(string); } hash_t Identifier::hashCode() { return String::calcHash(string); } int Identifier::equals(Object *o) { return this == o || memcmp(string,o->toChars(),len+1) == 0; } int Identifier::compare(Object *o) { return memcmp(string, o->toChars(), len + 1); } char *Identifier::toChars() { return (char *)string; } const char *Identifier::toHChars2() { const char *p = NULL; if (this == Id::ctor) p = "this"; else if (this == Id::dtor) p = "~this"; else if (this == Id::classInvariant) p = "invariant"; else if (this == Id::unitTest) p = "unittest"; else if (this == Id::dollar) p = "$"; else if (this == Id::withSym) p = "with"; else if (this == Id::result) p = "result"; else if (this == Id::returnLabel) p = "return"; else { p = toChars(); if (*p == '_') { if (memcmp(p, "_staticCtor", 11) == 0) p = "static this"; else if (memcmp(p, "_staticDtor", 11) == 0) p = "static ~this"; } } return p; } void Identifier::print() { fprintf(stdmsg, "%s",string); } int Identifier::dyncast() { return DYNCAST_IDENTIFIER; } Identifier *Identifier::generateId(const char *prefix) { static size_t i; return generateId(prefix, ++i); } Identifier *Identifier::generateId(const char *prefix, size_t i) { OutBuffer buf; buf.writestring(prefix); buf.printf("%zu", i); char *id = buf.toChars(); buf.data = NULL; return Lexer::idPool(id); }