[cfe-commits] r93955 - in /cfe/trunk: include/clang-c/Index.h tools/CIndex/CIndex.cpp tools/CIndex/CIndex.exports

[Douglas Gregor]

Author: dgregor
Date: Tue Jan 19 18:26:57 2010
New Revision: 93955

URL: http://llvm.org/viewvc/llvm-project?rev=93955&view=rev
Log:
Kill off clang_getDeclColumn, clang_getDeclExtent, clang_getDeclLine,
clang_getDeclSource, and clang_getDeclSourceFile; the cursor
equivalents are the way of the future.


Modified:
    cfe/trunk/include/clang-c/Index.h
    cfe/trunk/tools/CIndex/CIndex.cpp
    cfe/trunk/tools/CIndex/CIndex.exports

Modified: cfe/trunk/include/clang-c/Index.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=93955&r1=93954&r2=93955&view=diff

==============================================================================
--- cfe/trunk/include/clang-c/Index.h (original)
+++ cfe/trunk/include/clang-c/Index.h Tue Jan 19 18:26:57 2010
@@ -416,10 +416,6 @@
 CINDEX_LINKAGE CXCursor clang_getCursorFromDecl(CXDecl);
 CINDEX_LINKAGE CXEntity clang_getEntityFromDecl(CXIndex, CXDecl);
 CINDEX_LINKAGE CXString clang_getDeclSpelling(CXDecl);
-CINDEX_LINKAGE unsigned clang_getDeclLine(CXDecl); /* deprecate */
-CINDEX_LINKAGE unsigned clang_getDeclColumn(CXDecl); /* deprecate */
-CINDEX_LINKAGE const char *clang_getDeclSource(CXDecl); /* deprecate */
-CINDEX_LINKAGE CXFile clang_getDeclSourceFile(CXDecl); /* deprecate */
 
 /**
  * \brief Identifies a specific source location within a translation
@@ -478,13 +474,6 @@
  */
 CINDEX_LINKAGE CXSourceLocation clang_getRangeEnd(CXSourceRange range);
 
-/* clang_getDeclExtent() returns the physical extent of a declaration.  The
- * beginning line/column pair points to the start of the first token in the
- * declaration, and the ending line/column pair points to the last character in
- * the last token of the declaration.
- */
-CINDEX_LINKAGE CXSourceRange clang_getDeclExtent(CXDecl);
-
 /*
  * CXCursor Operations.
  */

Modified: cfe/trunk/tools/CIndex/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.cpp?rev=93955&r1=93954&r2=93955&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.cpp (original)
+++ cfe/trunk/tools/CIndex/CIndex.cpp Tue Jan 19 18:26:57 2010
@@ -691,16 +691,6 @@
 // CXDecl Operations.
 //===----------------------------------------------------------------------===//
 
-static const FileEntry *getFileEntryFromSourceLocation(SourceManager &SMgr,
-                                                       SourceLocation SLoc) {
-  FileID FID;
-  if (SLoc.isFileID())
-    FID = SMgr.getFileID(SLoc);
-  else
-    FID = SMgr.getDecomposedSpellingLoc(SLoc).first;
-  return SMgr.getFileEntryForID(FID);
-}
-
 extern "C" {
 CXString clang_getDeclSpelling(CXDecl AnonDecl) {
   assert(AnonDecl && "Passed null CXDecl");
@@ -725,38 +715,6 @@
   return CIndexer::createCXString("");
 }
 
-unsigned clang_getDeclLine(CXDecl AnonDecl) {
-  assert(AnonDecl && "Passed null CXDecl");
-  NamedDecl *ND = static_cast<NamedDecl *>(AnonDecl);
-  SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
-  return SourceMgr.getSpellingLineNumber(ND->getLocation());
-}
-
-unsigned clang_getDeclColumn(CXDecl AnonDecl) {
-  assert(AnonDecl && "Passed null CXDecl");
-  NamedDecl *ND = static_cast<NamedDecl *>(AnonDecl);
-  SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
-  return SourceMgr.getSpellingColumnNumber(ND->getLocation());
-}
-  
-CXSourceRange clang_getDeclExtent(CXDecl AnonDecl) {
-  return clang_getCursorExtent(clang_getCursorFromDecl(AnonDecl));
-}
-
-const char *clang_getDeclSource(CXDecl AnonDecl) {
-  assert(AnonDecl && "Passed null CXDecl");
-  FileEntry *FEnt = static_cast<FileEntry *>(clang_getDeclSourceFile(AnonDecl));
-  assert(FEnt && "Cannot find FileEntry for Decl");
-  return clang_getFileName(FEnt);
-}
-
-
-CXFile clang_getDeclSourceFile(CXDecl AnonDecl) {
-  assert(AnonDecl && "Passed null CXDecl");
-  NamedDecl *ND = static_cast<NamedDecl *>(AnonDecl);
-  SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
-  return (void *)getFileEntryFromSourceLocation(SourceMgr, ND->getLocation());
-}
 } // end: extern "C"
 
 //===----------------------------------------------------------------------===//

Modified: cfe/trunk/tools/CIndex/CIndex.exports
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.exports?rev=93955&r1=93954&r2=93955&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.exports (original)
+++ cfe/trunk/tools/CIndex/CIndex.exports Tue Jan 19 18:26:57 2010
@@ -22,12 +22,6 @@
 _clang_getCursorReferenced
 _clang_getCursorSpelling
 _clang_getCursorUSR
-_clang_getDeclColumn
-_clang_getDeclExtent
-_clang_getDeclExtent
-_clang_getDeclLine
-_clang_getDeclSource
-_clang_getDeclSourceFile
 _clang_getDeclSpelling
 _clang_getDeclaration
 _clang_getDefinitionSpellingAndExtent