if (!II)
return Entity();
- EntityImpl::IdEntryTy *Id =
- &Prog.getIdents().GetOrCreateValue(II->getName(),
- II->getName() + II->getLength());
+ IdentifierInfo *Id = &Prog.getIdents().get(II->getName(),
+ II->getName() + II->getLength());
unsigned IdNS = D->getIdentifierNamespace();
llvm::FoldingSetNodeID ID;
if (!DC)
return 0; // Couldn't get the parent context.
- IdentifierInfo &II = AST.Idents.get(Id->getKeyData());
+ IdentifierInfo &II = AST.Idents.get(Id->getName(),
+ Id->getName() + Id->getLength());
DeclContext::lookup_result Res = DC->lookup(DeclarationName(&II));
for (DeclContext::lookup_iterator I = Res.first, E = Res.second; I!=E; ++I) {
}
std::string EntityImpl::getPrintableName() {
- return std::string(Id->getKeyData(), Id->getKeyData() + Id->getKeyLength());
+ return Id->getName();
}
//===----------------------------------------------------------------------===//
#include "llvm/ADT/StringSet.h"
namespace clang {
+ class IdentifierInfo;
namespace idx {
class ProgramImpl;
class EntityImpl : public llvm::FoldingSetNode {
-public:
- typedef llvm::StringMapEntry<char> IdEntryTy;
-
-private:
Entity Parent;
- IdEntryTy *Id;
+ IdentifierInfo *Id;
/// \brief Identifier namespace.
unsigned IdNS;
public:
- EntityImpl(Entity parent, IdEntryTy *id, unsigned idNS)
+ EntityImpl(Entity parent, IdentifierInfo *id, unsigned idNS)
: Parent(parent), Id(id), IdNS(idNS) { }
/// \brief Find the Decl that can be referred to by this entity.
void Profile(llvm::FoldingSetNodeID &ID) const {
Profile(ID, Parent, Id, IdNS);
}
- static void Profile(llvm::FoldingSetNodeID &ID, Entity Parent, IdEntryTy *Id,
- unsigned IdNS) {
+ static void Profile(llvm::FoldingSetNodeID &ID, Entity Parent,
+ IdentifierInfo *Id, unsigned IdNS) {
ID.AddPointer(Parent.getAsOpaquePtr());
ID.AddPointer(Id);
ID.AddInteger(IdNS);
#define LLVM_CLANG_INDEX_PROGRAMIMPL_H
#include "EntityImpl.h"
+#include "clang/Basic/IdentifierTable.h"
+#include "clang/Basic/LangOptions.h"
namespace clang {
private:
EntitySetTy Entities;
- llvm::StringSet<> Idents;
llvm::BumpPtrAllocator BumpAlloc;
+
+ IdentifierTable Identifiers;
ProgramImpl(const ProgramImpl&); // do not implement
ProgramImpl &operator=(const ProgramImpl &); // do not implement
public:
- ProgramImpl() { }
+ ProgramImpl() : Identifiers(LangOptions()) { }
EntitySetTy &getEntities() { return Entities; }
- llvm::StringSet<> &getIdents() { return Idents; }
+ IdentifierTable &getIdents() { return Identifiers; }
void *Allocate(unsigned Size, unsigned Align = 8) {
return BumpAlloc.Allocate(Size, Align);