replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor USR generation for TagDecls into a common method. 

llvm-svn: 93799
This commit is contained in:
Ted Kremenek 2010-01-18 22:42:20 +00:00
parent eb0c52f194
commit 80de67b0cf
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clang/tools/CIndex/CIndexUSRs.cpp
View File

@ -78,7 +78,6 @@ public:
void VisitBlockDecl(BlockDecl *D); void VisitBlockDecl(BlockDecl *D);
void VisitDeclContext(DeclContext *D); void VisitDeclContext(DeclContext *D);
void VisitEnumDecl(EnumDecl *D);
void VisitFieldDecl(FieldDecl *D); void VisitFieldDecl(FieldDecl *D);
void VisitFunctionDecl(FunctionDecl *D); void VisitFunctionDecl(FunctionDecl *D);
void VisitNamedDecl(NamedDecl *D); void VisitNamedDecl(NamedDecl *D);
@ -86,8 +85,7 @@ public:
void VisitObjCContainerDecl(ObjCContainerDecl *CD); void VisitObjCContainerDecl(ObjCContainerDecl *CD);
void VisitObjCMethodDecl(ObjCMethodDecl *MD); void VisitObjCMethodDecl(ObjCMethodDecl *MD);
void VisitObjCPropertyDecl(ObjCPropertyDecl *D); void VisitObjCPropertyDecl(ObjCPropertyDecl *D);
void VisitRecordDecl(RecordDecl *D); void VisitTagDecl(TagDecl *D);
void VisitTagDeclCommon(TagDecl *D);
void VisitTypedefDecl(TypedefDecl *D); void VisitTypedefDecl(TypedefDecl *D);
}; };
} // end anonymous namespace } // end anonymous namespace
@ -103,12 +101,6 @@ void USRGenerator::VisitDeclContext(DeclContext *DC) {
Visit(D); Visit(D);
} }
void USRGenerator::VisitEnumDecl(EnumDecl *D) {
VisitDeclContext(D->getDeclContext());
Out << "@E^";
VisitTagDeclCommon(D);
}
void USRGenerator::VisitFieldDecl(FieldDecl *D) { void USRGenerator::VisitFieldDecl(FieldDecl *D) {
const std::string &s = D->getNameAsString(); const std::string &s = D->getNameAsString();
if (s.empty()) { if (s.empty()) {
@ -137,12 +129,6 @@ void USRGenerator::VisitNamespaceDecl(NamespaceDecl *D) {
Out << "@N^" << D->getNameAsString(); Out << "@N^" << D->getNameAsString();
} }
void USRGenerator::VisitRecordDecl(RecordDecl *D) {
VisitDeclContext(D->getDeclContext());
Out << "@S^";
VisitTagDeclCommon(D);
}
void USRGenerator::VisitObjCMethodDecl(ObjCMethodDecl *D) { void USRGenerator::VisitObjCMethodDecl(ObjCMethodDecl *D) {
Visit(cast<Decl>(D->getDeclContext())); Visit(cast<Decl>(D->getDeclContext()));
Out << (D->isInstanceMethod() ? "(im)" : "(cm)"); Out << (D->isInstanceMethod() ? "(im)" : "(cm)");
@ -180,7 +166,15 @@ void USRGenerator::VisitObjCPropertyDecl(ObjCPropertyDecl *D) {
Out << "(py)" << D->getName(); Out << "(py)" << D->getName();
} }
void USRGenerator::VisitTagDeclCommon(TagDecl *D) { void USRGenerator::VisitTagDecl(TagDecl *D) {
VisitDeclContext(D->getDeclContext());
switch (D->getTagKind()) {
case TagDecl::TK_struct: Out << "@S^"; break;
case TagDecl::TK_class: Out << "@C^"; break;
case TagDecl::TK_union: Out << "@U^"; break;
case TagDecl::TK_enum: Out << "@E^"; break;
}
// FIXME: Better support for anonymous structures and enums. // FIXME: Better support for anonymous structures and enums.
const std::string &s = D->getNameAsString(); const std::string &s = D->getNameAsString();
if (s.empty()) { if (s.empty()) {