Rename libIDE to libIndex.

Per feedback from Chandler, it's better to have libraries with more specific functionality.
LibIndex will contain the indexing functionality of libclang, which includes USR generation.

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

diff --git a/include/clang/IDE/USRGeneration.h b/include/clang/Index/USRGeneration.h
similarity index 94%
rename from include/clang/IDE/USRGeneration.h
rename to include/clang/Index/USRGeneration.h
index 7fb4f18279aa8b676b33ae78f9572ba2a55e5ce8..7921e063103486b3dde6fb7f2768f2250cc9111d 100644 (file)
--- a/include/clang/IDE/USRGeneration.h
+++ b/include/clang/Index/USRGeneration.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_IDE_USRGENERATION_H
-#define LLVM_CLANG_IDE_USRGENERATION_H
+#ifndef LLVM_CLANG_INDEX_USRGENERATION_H
+#define LLVM_CLANG_INDEX_USRGENERATION_H
 
 #include "clang/Basic/LLVM.h"
 #include "llvm/ADT/StringRef.h"
@@ -16,7 +16,7 @@
 namespace clang {
   class Decl;
 
-namespace ide {
+namespace index {
 
 static inline StringRef getUSRSpacePrefix() {
   return "c:";

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 95553ec6585075788f6be0b7ca022d091e236545..6df8ebcce65558dd1f583f59e0b722aee40e8010 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -17,7 +17,7 @@ add_subdirectory(Serialization)
 add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 add_subdirectory(Tooling)
-add_subdirectory(IDE)
+add_subdirectory(Index)
 if(CLANG_ENABLE_STATIC_ANALYZER)
   add_subdirectory(StaticAnalyzer)
 endif()

diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
deleted file mode 100644 (file)
index 8836010..0000000
--- a/lib/IDE/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_clang_library(clangIDE
-  USRGeneration.cpp
-  )
-
-target_link_libraries(clangIDE
-  clangBasic
-  clangAST
-  )

diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
new file mode 100644 (file)
index 0000000..97d4303
--- /dev/null
+++ b/lib/Index/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_clang_library(clangIndex
+  USRGeneration.cpp
+  )
+
+target_link_libraries(clangIndex
+  clangBasic
+  clangAST
+  )

diff --git a/lib/IDE/Makefile b/lib/Index/Makefile
similarity index 78%
rename from lib/IDE/Makefile
rename to lib/Index/Makefile
index 33d5b49297b78ebb25b7f6206f28e3006be28e0a..c53fccd1890e46cb9105d29a1925a05fc63026ab 100644 (file)
--- a/lib/IDE/Makefile
+++ b/lib/Index/Makefile
@@ -1,4 +1,4 @@
-##===- clang/lib/IDE/Makefile ------------------------------*- Makefile -*-===##
+##===- clang/lib/Index/Makefile ----------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../..
-LIBRARYNAME := clangIDE
+LIBRARYNAME := clangIndex
 
 include $(CLANG_LEVEL)/Makefile

diff --git a/lib/IDE/USRGeneration.cpp b/lib/Index/USRGeneration.cpp
similarity index 96%
rename from lib/IDE/USRGeneration.cpp
rename to lib/Index/USRGeneration.cpp
index d5eb9fed02e07918a76f2c00da8a6e7b019f7e32..b048bd6150fa5d9512c4c41ac13cbac38035136c 100644 (file)
--- a/lib/IDE/USRGeneration.cpp
+++ b/lib/Index/USRGeneration.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/IDE/USRGeneration.h"
+#include "clang/Index/USRGeneration.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/DeclVisitor.h"
@@ -40,7 +40,7 @@ public:
     generatedLoc(false)
   {
     // Add the USR space prefix.
-    Out << ide::getUSRSpacePrefix();
+    Out << index::getUSRSpacePrefix();
   }
 
   bool ignoreResults() const { return IgnoreResults; }
@@ -92,29 +92,29 @@ public:
 
   /// Generate a USR for an Objective-C class.
   void GenObjCClass(StringRef cls) {
-    ide::generateUSRForObjCClass(cls, Out);
+    index::generateUSRForObjCClass(cls, Out);
   }
   /// Generate a USR for an Objective-C class category.
   void GenObjCCategory(StringRef cls, StringRef cat) {
-    ide::generateUSRForObjCCategory(cls, cat, Out);
+    index::generateUSRForObjCCategory(cls, cat, Out);
   }
   /// Generate a USR fragment for an Objective-C instance variable.  The
   /// complete USR can be created by concatenating the USR for the
   /// encompassing class with this USR fragment.
   void GenObjCIvar(StringRef ivar) {
-    ide::generateUSRForObjCIvar(ivar, Out);
+    index::generateUSRForObjCIvar(ivar, Out);
   }
   /// Generate a USR fragment for an Objective-C method.
   void GenObjCMethod(StringRef sel, bool isInstanceMethod) {
-    ide::generateUSRForObjCMethod(sel, isInstanceMethod, Out);
+    index::generateUSRForObjCMethod(sel, isInstanceMethod, Out);
   }
   /// Generate a USR fragment for an Objective-C property.
   void GenObjCProperty(StringRef prop) {
-    ide::generateUSRForObjCProperty(prop, Out);
+    index::generateUSRForObjCProperty(prop, Out);
   }
   /// Generate a USR for an Objective-C protocol.
   void GenObjCProtocol(StringRef prot) {
-    ide::generateUSRForObjCProtocol(prot, Out);
+    index::generateUSRForObjCProtocol(prot, Out);
   }
 
   void VisitType(QualType T);
@@ -763,33 +763,33 @@ void USRGenerator::VisitTemplateArgument(const TemplateArgument &Arg) {
 // USR generation functions.
 //===----------------------------------------------------------------------===//
 
-void ide::generateUSRForObjCClass(StringRef Cls, raw_ostream &OS) {
+void index::generateUSRForObjCClass(StringRef Cls, raw_ostream &OS) {
   OS << "objc(cs)" << Cls;
 }
 
-void ide::generateUSRForObjCCategory(StringRef Cls, StringRef Cat,
+void index::generateUSRForObjCCategory(StringRef Cls, StringRef Cat,
                                      raw_ostream &OS) {
   OS << "objc(cy)" << Cls << '@' << Cat;
 }
 
-void ide::generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS) {
+void index::generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS) {
   OS << '@' << Ivar;
 }
 
-void ide::generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,
+void index::generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,
                                    raw_ostream &OS) {
   OS << (IsInstanceMethod ? "(im)" : "(cm)") << Sel;
 }
 
-void ide::generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS) {
+void index::generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS) {
   OS << "(py)" << Prop;
 }
 
-void ide::generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS) {
+void index::generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS) {
   OS << "objc(pl)" << Prot;
 }
 
-bool ide::generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf) {
+bool index::generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf) {
   // Don't generate USRs for things with invalid locations.
   if (!D || D->getLocStart().isInvalid())
     return true;

diff --git a/lib/Makefile b/lib/Makefile
index aff0c77f073705477e66eb982d47c7bc71d0de0e..57125273c5571c546798ee3faf76ad6c2afc9aa3 100755 (executable)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,7 @@ CLANG_LEVEL := ..
 # ARCMigrate and Rewrite are always needed because of libclang.
 PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Frontend \
                 FrontendTool Tooling Driver Format Edit ARCMigrate Rewrite \
-                Serialization IDE
+                Serialization Index
 
 include $(CLANG_LEVEL)/../../Makefile.config
 

diff --git a/tools/libclang/CIndexUSRs.cpp b/tools/libclang/CIndexUSRs.cpp
index 1e8d029e8c6a0225390b119c32ff4a6961846252..dad9f879869cc9e78c1c06db820503aaec58f22c 100644 (file)
--- a/tools/libclang/CIndexUSRs.cpp
+++ b/tools/libclang/CIndexUSRs.cpp
@@ -14,7 +14,7 @@
 #include "CIndexer.h"
 #include "CXCursor.h"
 #include "CXString.h"
-#include "clang/IDE/USRGeneration.h"
+#include "clang/Index/USRGeneration.h"
 #include "clang/Lex/PreprocessingRecord.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/raw_ostream.h"
@@ -30,7 +30,7 @@ static inline StringRef extractUSRSuffix(StringRef s) {
 }
 
 bool cxcursor::getDeclCursorUSR(const Decl *D, SmallVectorImpl<char> &Buf) {
-  return ide::generateUSRForDecl(D, Buf);
+  return index::generateUSRForDecl(D, Buf);
 }
 
 extern "C" {
@@ -72,7 +72,7 @@ CXString clang_getCursorUSR(CXCursor C) {
     if (!buf)
       return cxstring::createEmpty();
 
-    buf->Data += ide::getUSRSpacePrefix();
+    buf->Data += index::getUSRSpacePrefix();
     buf->Data += "macro@";
     buf->Data +=
         cxcursor::getCursorMacroDefinition(C)->getName()->getNameStart();
@@ -84,51 +84,51 @@ CXString clang_getCursorUSR(CXCursor C) {
 }
 
 CXString clang_constructUSR_ObjCIvar(const char *name, CXString classUSR) {
-  SmallString<128> Buf(ide::getUSRSpacePrefix());
+  SmallString<128> Buf(index::getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   OS << extractUSRSuffix(clang_getCString(classUSR));
-  ide::generateUSRForObjCIvar(name, OS);
+  index::generateUSRForObjCIvar(name, OS);
   return cxstring::createDup(OS.str());
 }
 
 CXString clang_constructUSR_ObjCMethod(const char *name,
                                        unsigned isInstanceMethod,
                                        CXString classUSR) {
-  SmallString<128> Buf(ide::getUSRSpacePrefix());
+  SmallString<128> Buf(index::getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   OS << extractUSRSuffix(clang_getCString(classUSR));
-  ide::generateUSRForObjCMethod(name, isInstanceMethod, OS);
+  index::generateUSRForObjCMethod(name, isInstanceMethod, OS);
   return cxstring::createDup(OS.str());
 }
 
 CXString clang_constructUSR_ObjCClass(const char *name) {
-  SmallString<128> Buf(ide::getUSRSpacePrefix());
+  SmallString<128> Buf(index::getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
-  ide::generateUSRForObjCClass(name, OS);
+  index::generateUSRForObjCClass(name, OS);
   return cxstring::createDup(OS.str());
 }
 
 CXString clang_constructUSR_ObjCProtocol(const char *name) {
-  SmallString<128> Buf(ide::getUSRSpacePrefix());
+  SmallString<128> Buf(index::getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
-  ide::generateUSRForObjCProtocol(name, OS);
+  index::generateUSRForObjCProtocol(name, OS);
   return cxstring::createDup(OS.str());
 }
 
 CXString clang_constructUSR_ObjCCategory(const char *class_name,
                                          const char *category_name) {
-  SmallString<128> Buf(ide::getUSRSpacePrefix());
+  SmallString<128> Buf(index::getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
-  ide::generateUSRForObjCCategory(class_name, category_name, OS);
+  index::generateUSRForObjCCategory(class_name, category_name, OS);
   return cxstring::createDup(OS.str());
 }
 
 CXString clang_constructUSR_ObjCProperty(const char *property,
                                          CXString classUSR) {
-  SmallString<128> Buf(ide::getUSRSpacePrefix());
+  SmallString<128> Buf(index::getUSRSpacePrefix());
   llvm::raw_svector_ostream OS(Buf);
   OS << extractUSRSuffix(clang_getCString(classUSR));
-  ide::generateUSRForObjCProperty(property, OS);
+  index::generateUSRForObjCProperty(property, OS);
   return cxstring::createDup(OS.str());
 }
 

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index ad6b95b481fdd8132196b5d66daa58c8bdb01be0..285820fe120f9a91e08d7363858699e6bea59bf5 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -44,7 +44,7 @@ set(SOURCES
   )
 
 set(LIBRARIES
-  clangIDE
+  clangIndex
   clangARCMigrate
   clangRewriteCore
   clangRewriteFrontend

diff --git a/tools/libclang/Makefile b/tools/libclang/Makefile
index 552df9397cc37812df68658605deb372f7fed867..90abe859bba5d2673fd9ebf24cd1707278c393c9 100644 (file)
--- a/tools/libclang/Makefile
+++ b/tools/libclang/Makefile
@@ -17,7 +17,7 @@ SHARED_LIBRARY = 1
 
 include $(CLANG_LEVEL)/../../Makefile.config
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
-USEDLIBS = clangIDE.a clangFrontend.a clangDriver.a \
+USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a \
           clangTooling.a \
           clangSerialization.a \
           clangParse.a clangSema.a \