From 56aac3f6c2d23c68f527c8225c74d833e534a262 Mon Sep 17 00:00:00 2001 From: Zhongxing Xu Date: Fri, 17 Jul 2009 07:49:44 +0000 Subject: [PATCH] Rename Entity::getName() to Entity::getPrintableName() to make its purpose more obvious. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76167 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Analysis/CallGraph.h | 2 +- include/clang/Index/Entity.h | 4 ++-- lib/Analysis/CallGraph.cpp | 5 +++-- lib/Index/Entity.cpp | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/clang/Analysis/CallGraph.h b/include/clang/Analysis/CallGraph.h index 8de0e9f976..e64c2ca8c7 100644 --- a/include/clang/Analysis/CallGraph.h +++ b/include/clang/Analysis/CallGraph.h @@ -45,7 +45,7 @@ public: bool hasCallee() const { return begin() != end(); } - const char *getName(ASTContext &Ctx) { return F->getName(Ctx); } + std::string getName(ASTContext &Ctx) { return F->getPrintableName(Ctx); } }; class CallGraph { diff --git a/include/clang/Index/Entity.h b/include/clang/Index/Entity.h index e65412cbf5..e1671bbdce 100644 --- a/include/clang/Index/Entity.h +++ b/include/clang/Index/Entity.h @@ -43,8 +43,8 @@ public: /// \brief Find the Decl that can be referred to by this entity. Decl *getDecl(ASTContext &AST); - /// \brief Get the Decl's name. - const char *getName(ASTContext &Ctx); + /// \brief Get a printable name for debugging purpose. + std::string getPrintableName(ASTContext &Ctx); /// \brief Get an Entity associated with the given Decl. /// \returns Null if an Entity cannot refer to this Decl. diff --git a/lib/Analysis/CallGraph.cpp b/lib/Analysis/CallGraph.cpp index 2ec6d2014d..b4f57b8fde 100644 --- a/lib/Analysis/CallGraph.cpp +++ b/lib/Analysis/CallGraph.cpp @@ -118,10 +118,11 @@ void CallGraph::print(llvm::raw_ostream &os) { for (iterator I = begin(), E = end(); I != E; ++I) { if (I->second->hasCallee()) { ASTContext &Ctx = *CallerCtx[I->second]; - os << "function: " << I->first->getName(Ctx) << " calls:\n"; + os << "function: " << I->first->getPrintableName(Ctx).c_str() + << " calls:\n"; for (CallGraphNode::iterator CI = I->second->begin(), CE = I->second->end(); CI != CE; ++CI) { - os << " " << CI->second->getName(Ctx); + os << " " << CI->second->getName(Ctx).c_str(); } os << '\n'; } diff --git a/lib/Index/Entity.cpp b/lib/Index/Entity.cpp index ca2e7c8f3e..7a6c05c416 100644 --- a/lib/Index/Entity.cpp +++ b/lib/Index/Entity.cpp @@ -126,11 +126,11 @@ Decl *Entity::getDecl(ASTContext &AST) { return 0; // Failed to find a decl using this Entity. } -const char *Entity::getName(ASTContext &Ctx) { +std::string Entity::getPrintableName(ASTContext &Ctx) { if (const NamedDecl *ND = dyn_cast_or_null(getDecl(Ctx))) { - return ND->getNameAsCString(); + return ND->getNameAsString(); } - return 0; + return std::string(); } /// \brief Get an Entity associated with the given Decl. -- 2.50.1