commit 172cb43b46e0deccbe4113bf65e278ce76ab5b18
author Daniel Dunbar <daniel@zuster.org> Thu Sep 03 05:59:50 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Thu Sep 03 05:59:50 2009 +0000
tree 494ab2f9a3a923b93055f0710be6ce4e9efbf169
parent 7e9854e58d3a892e2a25d1b5cfcadb20a352a5b0

Revert "Visit function/method bodies and issue callback for parameters and local
variables.", this is breaking x86_64-apple-darwin10 and Linux tests.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80896 91177308-0d34-0410-b5e6-96231b3b80d8

tools/CIndex/CIndex.cpp

diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index a0b49c4..82f7fb8 100644
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -67,9 +67,6 @@
         break;
     }
   }
-  void VisitVarDecl(VarDecl *ND) {
-    Call(CXCursor_VarDecl, ND);
-  }
   void VisitFunctionDecl(FunctionDecl *ND) {
     Call(ND->isThisDeclarationADefinition() ? CXCursor_FunctionDefn
                                             : CXCursor_FunctionDecl, ND);
@@ -98,9 +95,6 @@
   CXClientData CData;
   
   void Call(enum CXCursorKind CK, NamedDecl *ND) {
-    // Disable the callback when the context is equal to the visiting decl.
-    if (CDecl == ND)
-      return;
     CXCursor C = { CK, ND };
     Callback(CDecl, C, CData);
   }
@@ -135,28 +129,17 @@
   void VisitFieldDecl(FieldDecl *ND) {
     Call(CXCursor_FieldDecl, ND);
   }
-  void VisitVarDecl(VarDecl *ND) {
-    Call(CXCursor_VarDecl, ND);
-  }
-  void VisitParmVarDecl(ParmVarDecl *ND) {
-    Call(CXCursor_ParmDecl, ND);
-  }
   void VisitObjCPropertyDecl(ObjCPropertyDecl *ND) {
     Call(CXCursor_ObjCPropertyDecl, ND);
   }
   void VisitObjCIvarDecl(ObjCIvarDecl *ND) {
     Call(CXCursor_ObjCIvarDecl, ND);
   }
-  void VisitFunctionDecl(FunctionDecl *ND) {
-    if (ND->isThisDeclarationADefinition()) {
-      VisitDeclContext(dyn_cast<DeclContext>(ND));
-    }
-  }
   void VisitObjCMethodDecl(ObjCMethodDecl *ND) {
     if (ND->getBody()) {
       Call(ND->isInstanceMethod() ? CXCursor_ObjCInstanceMethodDefn
                                   : CXCursor_ObjCClassMethodDefn, ND);
-      VisitDeclContext(dyn_cast<DeclContext>(ND));
+      // FIXME: load body.
     } else
       Call(ND->isInstanceMethod() ? CXCursor_ObjCInstanceMethodDecl
                                   : CXCursor_ObjCClassMethodDecl, ND);
@@ -184,12 +167,6 @@
   return ASTUnit::LoadFromPCHFile(astName, CXXIdx->getFileManager(), &ErrMsg);
 }
 
-const char *clang_getTranslationUnitSpelling(CXTranslationUnit CTUnit) 
-{
-  assert(CTUnit && "Passed null CXTranslationUnit");
-  ASTUnit *CXXUnit = static_cast<ASTUnit *>(CTUnit);
-  return CXXUnit->getOriginalSourceFileName().c_str();
-}
 
 void clang_loadTranslationUnit(CXTranslationUnit CTUnit, 
                                CXTranslationUnitIterator callback,

tools/CIndex/CIndex.exports

diff --git a/tools/CIndex/CIndex.exports b/tools/CIndex/CIndex.exports
index 7c9660b..3f87a82 100644
--- a/tools/CIndex/CIndex.exports
+++ b/tools/CIndex/CIndex.exports
@@ -19,4 +19,3 @@
 _clang_isDefinition
 _clang_getCursorSpelling
 _clang_getCursorKindSpelling
-_clang_getTranslationUnitSpelling