diff options
| -rw-r--r-- | tools/CIndex/CIndexUSRs.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/tools/CIndex/CIndexUSRs.cpp b/tools/CIndex/CIndexUSRs.cpp index bd88ab44b8..bb74fe9321 100644 --- a/tools/CIndex/CIndexUSRs.cpp +++ b/tools/CIndex/CIndexUSRs.cpp @@ -78,7 +78,6 @@ public: void VisitBlockDecl(BlockDecl *D); void VisitDeclContext(DeclContext *D); - void VisitEnumDecl(EnumDecl *D); void VisitFieldDecl(FieldDecl *D); void VisitFunctionDecl(FunctionDecl *D); void VisitNamedDecl(NamedDecl *D); @@ -86,8 +85,7 @@ public: void VisitObjCContainerDecl(ObjCContainerDecl *CD); void VisitObjCMethodDecl(ObjCMethodDecl *MD); void VisitObjCPropertyDecl(ObjCPropertyDecl *D); - void VisitRecordDecl(RecordDecl *D); - void VisitTagDeclCommon(TagDecl *D); + void VisitTagDecl(TagDecl *D); void VisitTypedefDecl(TypedefDecl *D); }; } // end anonymous namespace @@ -103,12 +101,6 @@ void USRGenerator::VisitDeclContext(DeclContext *DC) { Visit(D); } -void USRGenerator::VisitEnumDecl(EnumDecl *D) { - VisitDeclContext(D->getDeclContext()); - Out << "@E^"; - VisitTagDeclCommon(D); -} - void USRGenerator::VisitFieldDecl(FieldDecl *D) { const std::string &s = D->getNameAsString(); if (s.empty()) { @@ -137,12 +129,6 @@ void USRGenerator::VisitNamespaceDecl(NamespaceDecl *D) { Out << "@N^" << D->getNameAsString(); } -void USRGenerator::VisitRecordDecl(RecordDecl *D) { - VisitDeclContext(D->getDeclContext()); - Out << "@S^"; - VisitTagDeclCommon(D); -} - void USRGenerator::VisitObjCMethodDecl(ObjCMethodDecl *D) { Visit(cast<Decl>(D->getDeclContext())); Out << (D->isInstanceMethod() ? "(im)" : "(cm)"); @@ -180,7 +166,15 @@ void USRGenerator::VisitObjCPropertyDecl(ObjCPropertyDecl *D) { 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. const std::string &s = D->getNameAsString(); if (s.empty()) { |