r188601 - Rename libIDE to libIndex.
Argyrios Kyrtzidis
akyrtzi at gmail.com
Fri Aug 16 17:40:41 PDT 2013
Author: akirtzidis
Date: Fri Aug 16 19:40:41 2013
New Revision: 188601
URL: http://llvm.org/viewvc/llvm-project?rev=188601&view=rev
Log:
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.
Added:
cfe/trunk/include/clang/Index/
cfe/trunk/include/clang/Index/USRGeneration.h
- copied, changed from r188600, cfe/trunk/include/clang/IDE/USRGeneration.h
cfe/trunk/lib/Index/
cfe/trunk/lib/Index/CMakeLists.txt
cfe/trunk/lib/Index/Makefile
- copied, changed from r188600, cfe/trunk/lib/IDE/Makefile
cfe/trunk/lib/Index/USRGeneration.cpp
- copied, changed from r188600, cfe/trunk/lib/IDE/USRGeneration.cpp
Removed:
cfe/trunk/include/clang/IDE/USRGeneration.h
cfe/trunk/lib/IDE/CMakeLists.txt
cfe/trunk/lib/IDE/Makefile
cfe/trunk/lib/IDE/USRGeneration.cpp
Modified:
cfe/trunk/lib/CMakeLists.txt
cfe/trunk/lib/Makefile
cfe/trunk/tools/libclang/CIndexUSRs.cpp
cfe/trunk/tools/libclang/CMakeLists.txt
cfe/trunk/tools/libclang/Makefile
Removed: cfe/trunk/include/clang/IDE/USRGeneration.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/IDE/USRGeneration.h?rev=188600&view=auto
==============================================================================
--- cfe/trunk/include/clang/IDE/USRGeneration.h (original)
+++ cfe/trunk/include/clang/IDE/USRGeneration.h (removed)
@@ -1,54 +0,0 @@
-//===- USRGeneration.h - Routines for USR generation ----------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_IDE_USRGENERATION_H
-#define LLVM_CLANG_IDE_USRGENERATION_H
-
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-
-namespace clang {
- class Decl;
-
-namespace ide {
-
-static inline StringRef getUSRSpacePrefix() {
- return "c:";
-}
-
-/// \brief Generate a USR for a Decl, including the prefix.
-/// \returns true if the results should be ignored, false otherwise.
-bool generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf);
-
-/// \brief Generate a USR fragment for an Objective-C class.
-void generateUSRForObjCClass(StringRef Cls, raw_ostream &OS);
-
-/// \brief Generate a USR fragment for an Objective-C class category.
-void generateUSRForObjCCategory(StringRef Cls, StringRef Cat, raw_ostream &OS);
-
-/// \brief 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 generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS);
-
-/// \brief Generate a USR fragment for an Objective-C method.
-void generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,
- raw_ostream &OS);
-
-/// \brief Generate a USR fragment for an Objective-C property.
-void generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS);
-
-/// \brief Generate a USR fragment for an Objective-C protocol.
-void generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS);
-
-} // namespace ide
-} // namespace clang
-
-#endif // LLVM_CLANG_IDE_USRGENERATION_H
-
Copied: cfe/trunk/include/clang/Index/USRGeneration.h (from r188600, cfe/trunk/include/clang/IDE/USRGeneration.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/USRGeneration.h?p2=cfe/trunk/include/clang/Index/USRGeneration.h&p1=cfe/trunk/include/clang/IDE/USRGeneration.h&r1=188600&r2=188601&rev=188601&view=diff
==============================================================================
--- cfe/trunk/include/clang/IDE/USRGeneration.h (original)
+++ cfe/trunk/include/clang/Index/USRGeneration.h Fri Aug 16 19:40:41 2013
@@ -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:";
Modified: cfe/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CMakeLists.txt?rev=188601&r1=188600&r2=188601&view=diff
==============================================================================
--- cfe/trunk/lib/CMakeLists.txt (original)
+++ cfe/trunk/lib/CMakeLists.txt Fri Aug 16 19:40:41 2013
@@ -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()
Removed: cfe/trunk/lib/IDE/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/CMakeLists.txt?rev=188600&view=auto
==============================================================================
--- cfe/trunk/lib/IDE/CMakeLists.txt (original)
+++ cfe/trunk/lib/IDE/CMakeLists.txt (removed)
@@ -1,8 +0,0 @@
-add_clang_library(clangIDE
- USRGeneration.cpp
- )
-
-target_link_libraries(clangIDE
- clangBasic
- clangAST
- )
Removed: cfe/trunk/lib/IDE/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/Makefile?rev=188600&view=auto
==============================================================================
--- cfe/trunk/lib/IDE/Makefile (original)
+++ cfe/trunk/lib/IDE/Makefile (removed)
@@ -1,13 +0,0 @@
-##===- clang/lib/IDE/Makefile ------------------------------*- Makefile -*-===##
-#
-# The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../..
-LIBRARYNAME := clangIDE
-
-include $(CLANG_LEVEL)/Makefile
Removed: cfe/trunk/lib/IDE/USRGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/IDE/USRGeneration.cpp?rev=188600&view=auto
==============================================================================
--- cfe/trunk/lib/IDE/USRGeneration.cpp (original)
+++ cfe/trunk/lib/IDE/USRGeneration.cpp (removed)
@@ -1,800 +0,0 @@
-//===- USRGeneration.cpp - Routines for USR generation --------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/IDE/USRGeneration.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/DeclVisitor.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace clang;
-
-//===----------------------------------------------------------------------===//
-// USR generation.
-//===----------------------------------------------------------------------===//
-
-namespace {
-class USRGenerator : public ConstDeclVisitor<USRGenerator> {
- SmallVectorImpl<char> &Buf;
- llvm::raw_svector_ostream Out;
- bool IgnoreResults;
- ASTContext *Context;
- bool generatedLoc;
-
- llvm::DenseMap<const Type *, unsigned> TypeSubstitutions;
-
-public:
- explicit USRGenerator(ASTContext *Ctx, SmallVectorImpl<char> &Buf)
- : Buf(Buf),
- Out(Buf),
- IgnoreResults(false),
- Context(Ctx),
- generatedLoc(false)
- {
- // Add the USR space prefix.
- Out << ide::getUSRSpacePrefix();
- }
-
- bool ignoreResults() const { return IgnoreResults; }
-
- // Visitation methods from generating USRs from AST elements.
- void VisitDeclContext(const DeclContext *D);
- void VisitFieldDecl(const FieldDecl *D);
- void VisitFunctionDecl(const FunctionDecl *D);
- void VisitNamedDecl(const NamedDecl *D);
- void VisitNamespaceDecl(const NamespaceDecl *D);
- void VisitNamespaceAliasDecl(const NamespaceAliasDecl *D);
- void VisitFunctionTemplateDecl(const FunctionTemplateDecl *D);
- void VisitClassTemplateDecl(const ClassTemplateDecl *D);
- void VisitObjCContainerDecl(const ObjCContainerDecl *CD);
- void VisitObjCMethodDecl(const ObjCMethodDecl *MD);
- void VisitObjCPropertyDecl(const ObjCPropertyDecl *D);
- void VisitObjCPropertyImplDecl(const ObjCPropertyImplDecl *D);
- void VisitTagDecl(const TagDecl *D);
- void VisitTypedefDecl(const TypedefDecl *D);
- void VisitTemplateTypeParmDecl(const TemplateTypeParmDecl *D);
- void VisitVarDecl(const VarDecl *D);
- void VisitNonTypeTemplateParmDecl(const NonTypeTemplateParmDecl *D);
- void VisitTemplateTemplateParmDecl(const TemplateTemplateParmDecl *D);
- void VisitLinkageSpecDecl(const LinkageSpecDecl *D) {
- IgnoreResults = true;
- }
- void VisitUsingDirectiveDecl(const UsingDirectiveDecl *D) {
- IgnoreResults = true;
- }
- void VisitUsingDecl(const UsingDecl *D) {
- IgnoreResults = true;
- }
- void VisitUnresolvedUsingValueDecl(const UnresolvedUsingValueDecl *D) {
- IgnoreResults = true;
- }
- void VisitUnresolvedUsingTypenameDecl(const UnresolvedUsingTypenameDecl *D) {
- IgnoreResults = true;
- }
-
- /// Generate the string component containing the location of the
- /// declaration.
- bool GenLoc(const Decl *D);
-
- /// String generation methods used both by the visitation methods
- /// and from other clients that want to directly generate USRs. These
- /// methods do not construct complete USRs (which incorporate the parents
- /// of an AST element), but only the fragments concerning the AST element
- /// itself.
-
- /// Generate a USR for an Objective-C class.
- void GenObjCClass(StringRef cls) {
- ide::generateUSRForObjCClass(cls, Out);
- }
- /// Generate a USR for an Objective-C class category.
- void GenObjCCategory(StringRef cls, StringRef cat) {
- ide::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);
- }
- /// Generate a USR fragment for an Objective-C method.
- void GenObjCMethod(StringRef sel, bool isInstanceMethod) {
- ide::generateUSRForObjCMethod(sel, isInstanceMethod, Out);
- }
- /// Generate a USR fragment for an Objective-C property.
- void GenObjCProperty(StringRef prop) {
- ide::generateUSRForObjCProperty(prop, Out);
- }
- /// Generate a USR for an Objective-C protocol.
- void GenObjCProtocol(StringRef prot) {
- ide::generateUSRForObjCProtocol(prot, Out);
- }
-
- void VisitType(QualType T);
- void VisitTemplateParameterList(const TemplateParameterList *Params);
- void VisitTemplateName(TemplateName Name);
- void VisitTemplateArgument(const TemplateArgument &Arg);
-
- /// Emit a Decl's name using NamedDecl::printName() and return true if
- /// the decl had no name.
- bool EmitDeclName(const NamedDecl *D);
-};
-
-} // end anonymous namespace
-
-//===----------------------------------------------------------------------===//
-// Generating USRs from ASTS.
-//===----------------------------------------------------------------------===//
-
-bool USRGenerator::EmitDeclName(const NamedDecl *D) {
- Out.flush();
- const unsigned startSize = Buf.size();
- D->printName(Out);
- Out.flush();
- const unsigned endSize = Buf.size();
- return startSize == endSize;
-}
-
-static inline bool ShouldGenerateLocation(const NamedDecl *D) {
- return !D->isExternallyVisible();
-}
-
-void USRGenerator::VisitDeclContext(const DeclContext *DC) {
- if (const NamedDecl *D = dyn_cast<NamedDecl>(DC))
- Visit(D);
-}
-
-void USRGenerator::VisitFieldDecl(const FieldDecl *D) {
- // The USR for an ivar declared in a class extension is based on the
- // ObjCInterfaceDecl, not the ObjCCategoryDecl.
- if (const ObjCInterfaceDecl *ID = Context->getObjContainingInterface(D))
- Visit(ID);
- else
- VisitDeclContext(D->getDeclContext());
- Out << (isa<ObjCIvarDecl>(D) ? "@" : "@FI@");
- if (EmitDeclName(D)) {
- // Bit fields can be anonymous.
- IgnoreResults = true;
- return;
- }
-}
-
-void USRGenerator::VisitFunctionDecl(const FunctionDecl *D) {
- if (ShouldGenerateLocation(D) && GenLoc(D))
- return;
-
- VisitDeclContext(D->getDeclContext());
- if (FunctionTemplateDecl *FunTmpl = D->getDescribedFunctionTemplate()) {
- Out << "@FT@";
- VisitTemplateParameterList(FunTmpl->getTemplateParameters());
- } else
- Out << "@F@";
- D->printName(Out);
-
- ASTContext &Ctx = *Context;
- if (!Ctx.getLangOpts().CPlusPlus || D->isExternC())
- return;
-
- if (const TemplateArgumentList *
- SpecArgs = D->getTemplateSpecializationArgs()) {
- Out << '<';
- for (unsigned I = 0, N = SpecArgs->size(); I != N; ++I) {
- Out << '#';
- VisitTemplateArgument(SpecArgs->get(I));
- }
- Out << '>';
- }
-
- // Mangle in type information for the arguments.
- for (FunctionDecl::param_const_iterator I = D->param_begin(),
- E = D->param_end();
- I != E; ++I) {
- Out << '#';
- if (ParmVarDecl *PD = *I)
- VisitType(PD->getType());
- }
- if (D->isVariadic())
- Out << '.';
- Out << '#';
- if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D)) {
- if (MD->isStatic())
- Out << 'S';
- if (unsigned quals = MD->getTypeQualifiers())
- Out << (char)('0' + quals);
- }
-}
-
-void USRGenerator::VisitNamedDecl(const NamedDecl *D) {
- VisitDeclContext(D->getDeclContext());
- Out << "@";
-
- if (EmitDeclName(D)) {
- // The string can be empty if the declaration has no name; e.g., it is
- // the ParmDecl with no name for declaration of a function pointer type,
- // e.g.: void (*f)(void *);
- // In this case, don't generate a USR.
- IgnoreResults = true;
- }
-}
-
-void USRGenerator::VisitVarDecl(const VarDecl *D) {
- // VarDecls can be declared 'extern' within a function or method body,
- // but their enclosing DeclContext is the function, not the TU. We need
- // to check the storage class to correctly generate the USR.
- if (ShouldGenerateLocation(D) && GenLoc(D))
- return;
-
- VisitDeclContext(D->getDeclContext());
-
- // Variables always have simple names.
- StringRef s = D->getName();
-
- // The string can be empty if the declaration has no name; e.g., it is
- // the ParmDecl with no name for declaration of a function pointer type, e.g.:
- // void (*f)(void *);
- // In this case, don't generate a USR.
- if (s.empty())
- IgnoreResults = true;
- else
- Out << '@' << s;
-}
-
-void USRGenerator::VisitNonTypeTemplateParmDecl(
- const NonTypeTemplateParmDecl *D) {
- GenLoc(D);
- return;
-}
-
-void USRGenerator::VisitTemplateTemplateParmDecl(
- const TemplateTemplateParmDecl *D) {
- GenLoc(D);
- return;
-}
-
-void USRGenerator::VisitNamespaceDecl(const NamespaceDecl *D) {
- if (D->isAnonymousNamespace()) {
- Out << "@aN";
- return;
- }
-
- VisitDeclContext(D->getDeclContext());
- if (!IgnoreResults)
- Out << "@N@" << D->getName();
-}
-
-void USRGenerator::VisitFunctionTemplateDecl(const FunctionTemplateDecl *D) {
- VisitFunctionDecl(D->getTemplatedDecl());
-}
-
-void USRGenerator::VisitClassTemplateDecl(const ClassTemplateDecl *D) {
- VisitTagDecl(D->getTemplatedDecl());
-}
-
-void USRGenerator::VisitNamespaceAliasDecl(const NamespaceAliasDecl *D) {
- VisitDeclContext(D->getDeclContext());
- if (!IgnoreResults)
- Out << "@NA@" << D->getName();
-}
-
-void USRGenerator::VisitObjCMethodDecl(const ObjCMethodDecl *D) {
- const DeclContext *container = D->getDeclContext();
- if (const ObjCProtocolDecl *pd = dyn_cast<ObjCProtocolDecl>(container)) {
- Visit(pd);
- }
- else {
- // The USR for a method declared in a class extension or category is based on
- // the ObjCInterfaceDecl, not the ObjCCategoryDecl.
- const ObjCInterfaceDecl *ID = D->getClassInterface();
- if (!ID) {
- IgnoreResults = true;
- return;
- }
- Visit(ID);
- }
- // Ideally we would use 'GenObjCMethod', but this is such a hot path
- // for Objective-C code that we don't want to use
- // DeclarationName::getAsString().
- Out << (D->isInstanceMethod() ? "(im)" : "(cm)")
- << DeclarationName(D->getSelector());
-}
-
-void USRGenerator::VisitObjCContainerDecl(const ObjCContainerDecl *D) {
- switch (D->getKind()) {
- default:
- llvm_unreachable("Invalid ObjC container.");
- case Decl::ObjCInterface:
- case Decl::ObjCImplementation:
- GenObjCClass(D->getName());
- break;
- case Decl::ObjCCategory: {
- const ObjCCategoryDecl *CD = cast<ObjCCategoryDecl>(D);
- const ObjCInterfaceDecl *ID = CD->getClassInterface();
- if (!ID) {
- // Handle invalid code where the @interface might not
- // have been specified.
- // FIXME: We should be able to generate this USR even if the
- // @interface isn't available.
- IgnoreResults = true;
- return;
- }
- // Specially handle class extensions, which are anonymous categories.
- // We want to mangle in the location to uniquely distinguish them.
- if (CD->IsClassExtension()) {
- Out << "objc(ext)" << ID->getName() << '@';
- GenLoc(CD);
- }
- else
- GenObjCCategory(ID->getName(), CD->getName());
-
- break;
- }
- case Decl::ObjCCategoryImpl: {
- const ObjCCategoryImplDecl *CD = cast<ObjCCategoryImplDecl>(D);
- const ObjCInterfaceDecl *ID = CD->getClassInterface();
- if (!ID) {
- // Handle invalid code where the @interface might not
- // have been specified.
- // FIXME: We should be able to generate this USR even if the
- // @interface isn't available.
- IgnoreResults = true;
- return;
- }
- GenObjCCategory(ID->getName(), CD->getName());
- break;
- }
- case Decl::ObjCProtocol:
- GenObjCProtocol(cast<ObjCProtocolDecl>(D)->getName());
- break;
- }
-}
-
-void USRGenerator::VisitObjCPropertyDecl(const ObjCPropertyDecl *D) {
- // The USR for a property declared in a class extension or category is based
- // on the ObjCInterfaceDecl, not the ObjCCategoryDecl.
- if (const ObjCInterfaceDecl *ID = Context->getObjContainingInterface(D))
- Visit(ID);
- else
- Visit(cast<Decl>(D->getDeclContext()));
- GenObjCProperty(D->getName());
-}
-
-void USRGenerator::VisitObjCPropertyImplDecl(const ObjCPropertyImplDecl *D) {
- if (ObjCPropertyDecl *PD = D->getPropertyDecl()) {
- VisitObjCPropertyDecl(PD);
- return;
- }
-
- IgnoreResults = true;
-}
-
-void USRGenerator::VisitTagDecl(const TagDecl *D) {
- // Add the location of the tag decl to handle resolution across
- // translation units.
- if (ShouldGenerateLocation(D) && GenLoc(D))
- return;
-
- D = D->getCanonicalDecl();
- VisitDeclContext(D->getDeclContext());
-
- bool AlreadyStarted = false;
- if (const CXXRecordDecl *CXXRecord = dyn_cast<CXXRecordDecl>(D)) {
- if (ClassTemplateDecl *ClassTmpl = CXXRecord->getDescribedClassTemplate()) {
- AlreadyStarted = true;
-
- switch (D->getTagKind()) {
- case TTK_Interface:
- case TTK_Struct: Out << "@ST"; break;
- case TTK_Class: Out << "@CT"; break;
- case TTK_Union: Out << "@UT"; break;
- case TTK_Enum: llvm_unreachable("enum template");
- }
- VisitTemplateParameterList(ClassTmpl->getTemplateParameters());
- } else if (const ClassTemplatePartialSpecializationDecl *PartialSpec
- = dyn_cast<ClassTemplatePartialSpecializationDecl>(CXXRecord)) {
- AlreadyStarted = true;
-
- switch (D->getTagKind()) {
- case TTK_Interface:
- case TTK_Struct: Out << "@SP"; break;
- case TTK_Class: Out << "@CP"; break;
- case TTK_Union: Out << "@UP"; break;
- case TTK_Enum: llvm_unreachable("enum partial specialization");
- }
- VisitTemplateParameterList(PartialSpec->getTemplateParameters());
- }
- }
-
- if (!AlreadyStarted) {
- switch (D->getTagKind()) {
- case TTK_Interface:
- case TTK_Struct: Out << "@S"; break;
- case TTK_Class: Out << "@C"; break;
- case TTK_Union: Out << "@U"; break;
- case TTK_Enum: Out << "@E"; break;
- }
- }
-
- Out << '@';
- Out.flush();
- assert(Buf.size() > 0);
- const unsigned off = Buf.size() - 1;
-
- if (EmitDeclName(D)) {
- if (const TypedefNameDecl *TD = D->getTypedefNameForAnonDecl()) {
- Buf[off] = 'A';
- Out << '@' << *TD;
- }
- else
- Buf[off] = 'a';
- }
-
- // For a class template specialization, mangle the template arguments.
- if (const ClassTemplateSpecializationDecl *Spec
- = dyn_cast<ClassTemplateSpecializationDecl>(D)) {
- const TemplateArgumentList &Args = Spec->getTemplateInstantiationArgs();
- Out << '>';
- for (unsigned I = 0, N = Args.size(); I != N; ++I) {
- Out << '#';
- VisitTemplateArgument(Args.get(I));
- }
- }
-}
-
-void USRGenerator::VisitTypedefDecl(const TypedefDecl *D) {
- if (ShouldGenerateLocation(D) && GenLoc(D))
- return;
- const DeclContext *DC = D->getDeclContext();
- if (const NamedDecl *DCN = dyn_cast<NamedDecl>(DC))
- Visit(DCN);
- Out << "@T@";
- Out << D->getName();
-}
-
-void USRGenerator::VisitTemplateTypeParmDecl(const TemplateTypeParmDecl *D) {
- GenLoc(D);
- return;
-}
-
-bool USRGenerator::GenLoc(const Decl *D) {
- if (generatedLoc)
- return IgnoreResults;
- generatedLoc = true;
-
- // Guard against null declarations in invalid code.
- if (!D) {
- IgnoreResults = true;
- return true;
- }
-
- // Use the location of canonical decl.
- D = D->getCanonicalDecl();
-
- const SourceManager &SM = Context->getSourceManager();
- SourceLocation L = D->getLocStart();
- if (L.isInvalid()) {
- IgnoreResults = true;
- return true;
- }
- L = SM.getExpansionLoc(L);
- const std::pair<FileID, unsigned> &Decomposed = SM.getDecomposedLoc(L);
- const FileEntry *FE = SM.getFileEntryForID(Decomposed.first);
- if (FE) {
- Out << llvm::sys::path::filename(FE->getName());
- }
- else {
- // This case really isn't interesting.
- IgnoreResults = true;
- return true;
- }
- // Use the offest into the FileID to represent the location. Using
- // a line/column can cause us to look back at the original source file,
- // which is expensive.
- Out << '@' << Decomposed.second;
- return IgnoreResults;
-}
-
-void USRGenerator::VisitType(QualType T) {
- // This method mangles in USR information for types. It can possibly
- // just reuse the naming-mangling logic used by codegen, although the
- // requirements for USRs might not be the same.
- ASTContext &Ctx = *Context;
-
- do {
- T = Ctx.getCanonicalType(T);
- Qualifiers Q = T.getQualifiers();
- unsigned qVal = 0;
- if (Q.hasConst())
- qVal |= 0x1;
- if (Q.hasVolatile())
- qVal |= 0x2;
- if (Q.hasRestrict())
- qVal |= 0x4;
- if(qVal)
- Out << ((char) ('0' + qVal));
-
- // Mangle in ObjC GC qualifiers?
-
- if (const PackExpansionType *Expansion = T->getAs<PackExpansionType>()) {
- Out << 'P';
- T = Expansion->getPattern();
- }
-
- if (const BuiltinType *BT = T->getAs<BuiltinType>()) {
- unsigned char c = '\0';
- switch (BT->getKind()) {
- case BuiltinType::Void:
- c = 'v'; break;
- case BuiltinType::Bool:
- c = 'b'; break;
- case BuiltinType::Char_U:
- case BuiltinType::UChar:
- c = 'c'; break;
- case BuiltinType::Char16:
- c = 'q'; break;
- case BuiltinType::Char32:
- c = 'w'; break;
- case BuiltinType::UShort:
- c = 's'; break;
- case BuiltinType::UInt:
- c = 'i'; break;
- case BuiltinType::ULong:
- c = 'l'; break;
- case BuiltinType::ULongLong:
- c = 'k'; break;
- case BuiltinType::UInt128:
- c = 'j'; break;
- case BuiltinType::Char_S:
- case BuiltinType::SChar:
- c = 'C'; break;
- case BuiltinType::WChar_S:
- case BuiltinType::WChar_U:
- c = 'W'; break;
- case BuiltinType::Short:
- c = 'S'; break;
- case BuiltinType::Int:
- c = 'I'; break;
- case BuiltinType::Long:
- c = 'L'; break;
- case BuiltinType::LongLong:
- c = 'K'; break;
- case BuiltinType::Int128:
- c = 'J'; break;
- case BuiltinType::Half:
- c = 'h'; break;
- case BuiltinType::Float:
- c = 'f'; break;
- case BuiltinType::Double:
- c = 'd'; break;
- case BuiltinType::LongDouble:
- c = 'D'; break;
- case BuiltinType::NullPtr:
- c = 'n'; break;
-#define BUILTIN_TYPE(Id, SingletonId)
-#define PLACEHOLDER_TYPE(Id, SingletonId) case BuiltinType::Id:
-#include "clang/AST/BuiltinTypes.def"
- case BuiltinType::Dependent:
- case BuiltinType::OCLImage1d:
- case BuiltinType::OCLImage1dArray:
- case BuiltinType::OCLImage1dBuffer:
- case BuiltinType::OCLImage2d:
- case BuiltinType::OCLImage2dArray:
- case BuiltinType::OCLImage3d:
- case BuiltinType::OCLEvent:
- case BuiltinType::OCLSampler:
- IgnoreResults = true;
- return;
- case BuiltinType::ObjCId:
- c = 'o'; break;
- case BuiltinType::ObjCClass:
- c = 'O'; break;
- case BuiltinType::ObjCSel:
- c = 'e'; break;
- }
- Out << c;
- return;
- }
-
- // If we have already seen this (non-built-in) type, use a substitution
- // encoding.
- llvm::DenseMap<const Type *, unsigned>::iterator Substitution
- = TypeSubstitutions.find(T.getTypePtr());
- if (Substitution != TypeSubstitutions.end()) {
- Out << 'S' << Substitution->second << '_';
- return;
- } else {
- // Record this as a substitution.
- unsigned Number = TypeSubstitutions.size();
- TypeSubstitutions[T.getTypePtr()] = Number;
- }
-
- if (const PointerType *PT = T->getAs<PointerType>()) {
- Out << '*';
- T = PT->getPointeeType();
- continue;
- }
- if (const ReferenceType *RT = T->getAs<ReferenceType>()) {
- Out << '&';
- T = RT->getPointeeType();
- continue;
- }
- if (const FunctionProtoType *FT = T->getAs<FunctionProtoType>()) {
- Out << 'F';
- VisitType(FT->getResultType());
- for (FunctionProtoType::arg_type_iterator
- I = FT->arg_type_begin(), E = FT->arg_type_end(); I!=E; ++I) {
- VisitType(*I);
- }
- if (FT->isVariadic())
- Out << '.';
- return;
- }
- if (const BlockPointerType *BT = T->getAs<BlockPointerType>()) {
- Out << 'B';
- T = BT->getPointeeType();
- continue;
- }
- if (const ComplexType *CT = T->getAs<ComplexType>()) {
- Out << '<';
- T = CT->getElementType();
- continue;
- }
- if (const TagType *TT = T->getAs<TagType>()) {
- Out << '$';
- VisitTagDecl(TT->getDecl());
- return;
- }
- if (const TemplateTypeParmType *TTP = T->getAs<TemplateTypeParmType>()) {
- Out << 't' << TTP->getDepth() << '.' << TTP->getIndex();
- return;
- }
- if (const TemplateSpecializationType *Spec
- = T->getAs<TemplateSpecializationType>()) {
- Out << '>';
- VisitTemplateName(Spec->getTemplateName());
- Out << Spec->getNumArgs();
- for (unsigned I = 0, N = Spec->getNumArgs(); I != N; ++I)
- VisitTemplateArgument(Spec->getArg(I));
- return;
- }
-
- // Unhandled type.
- Out << ' ';
- break;
- } while (true);
-}
-
-void USRGenerator::VisitTemplateParameterList(
- const TemplateParameterList *Params) {
- if (!Params)
- return;
- Out << '>' << Params->size();
- for (TemplateParameterList::const_iterator P = Params->begin(),
- PEnd = Params->end();
- P != PEnd; ++P) {
- Out << '#';
- if (isa<TemplateTypeParmDecl>(*P)) {
- if (cast<TemplateTypeParmDecl>(*P)->isParameterPack())
- Out<< 'p';
- Out << 'T';
- continue;
- }
-
- if (NonTypeTemplateParmDecl *NTTP = dyn_cast<NonTypeTemplateParmDecl>(*P)) {
- if (NTTP->isParameterPack())
- Out << 'p';
- Out << 'N';
- VisitType(NTTP->getType());
- continue;
- }
-
- TemplateTemplateParmDecl *TTP = cast<TemplateTemplateParmDecl>(*P);
- if (TTP->isParameterPack())
- Out << 'p';
- Out << 't';
- VisitTemplateParameterList(TTP->getTemplateParameters());
- }
-}
-
-void USRGenerator::VisitTemplateName(TemplateName Name) {
- if (TemplateDecl *Template = Name.getAsTemplateDecl()) {
- if (TemplateTemplateParmDecl *TTP
- = dyn_cast<TemplateTemplateParmDecl>(Template)) {
- Out << 't' << TTP->getDepth() << '.' << TTP->getIndex();
- return;
- }
-
- Visit(Template);
- return;
- }
-
- // FIXME: Visit dependent template names.
-}
-
-void USRGenerator::VisitTemplateArgument(const TemplateArgument &Arg) {
- switch (Arg.getKind()) {
- case TemplateArgument::Null:
- break;
-
- case TemplateArgument::Declaration:
- Visit(Arg.getAsDecl());
- break;
-
- case TemplateArgument::NullPtr:
- break;
-
- case TemplateArgument::TemplateExpansion:
- Out << 'P'; // pack expansion of...
- // Fall through
- case TemplateArgument::Template:
- VisitTemplateName(Arg.getAsTemplateOrTemplatePattern());
- break;
-
- case TemplateArgument::Expression:
- // FIXME: Visit expressions.
- break;
-
- case TemplateArgument::Pack:
- Out << 'p' << Arg.pack_size();
- for (TemplateArgument::pack_iterator P = Arg.pack_begin(), PEnd = Arg.pack_end();
- P != PEnd; ++P)
- VisitTemplateArgument(*P);
- break;
-
- case TemplateArgument::Type:
- VisitType(Arg.getAsType());
- break;
-
- case TemplateArgument::Integral:
- Out << 'V';
- VisitType(Arg.getIntegralType());
- Out << Arg.getAsIntegral();
- break;
- }
-}
-
-//===----------------------------------------------------------------------===//
-// USR generation functions.
-//===----------------------------------------------------------------------===//
-
-void ide::generateUSRForObjCClass(StringRef Cls, raw_ostream &OS) {
- OS << "objc(cs)" << Cls;
-}
-
-void ide::generateUSRForObjCCategory(StringRef Cls, StringRef Cat,
- raw_ostream &OS) {
- OS << "objc(cy)" << Cls << '@' << Cat;
-}
-
-void ide::generateUSRForObjCIvar(StringRef Ivar, raw_ostream &OS) {
- OS << '@' << Ivar;
-}
-
-void ide::generateUSRForObjCMethod(StringRef Sel, bool IsInstanceMethod,
- raw_ostream &OS) {
- OS << (IsInstanceMethod ? "(im)" : "(cm)") << Sel;
-}
-
-void ide::generateUSRForObjCProperty(StringRef Prop, raw_ostream &OS) {
- OS << "(py)" << Prop;
-}
-
-void ide::generateUSRForObjCProtocol(StringRef Prot, raw_ostream &OS) {
- OS << "objc(pl)" << Prot;
-}
-
-bool ide::generateUSRForDecl(const Decl *D, SmallVectorImpl<char> &Buf) {
- // Don't generate USRs for things with invalid locations.
- if (!D || D->getLocStart().isInvalid())
- return true;
-
- USRGenerator UG(&D->getASTContext(), Buf);
- UG.Visit(D);
- return UG.ignoreResults();
-}
Added: cfe/trunk/lib/Index/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/CMakeLists.txt?rev=188601&view=auto
==============================================================================
--- cfe/trunk/lib/Index/CMakeLists.txt (added)
+++ cfe/trunk/lib/Index/CMakeLists.txt Fri Aug 16 19:40:41 2013
@@ -0,0 +1,8 @@
+add_clang_library(clangIndex
+ USRGeneration.cpp
+ )
+
+target_link_libraries(clangIndex
+ clangBasic
+ clangAST
+ )
Copied: cfe/trunk/lib/Index/Makefile (from r188600, cfe/trunk/lib/IDE/Makefile)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/Makefile?p2=cfe/trunk/lib/Index/Makefile&p1=cfe/trunk/lib/IDE/Makefile&r1=188600&r2=188601&rev=188601&view=diff
==============================================================================
--- cfe/trunk/lib/IDE/Makefile (original)
+++ cfe/trunk/lib/Index/Makefile Fri Aug 16 19:40:41 2013
@@ -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
Copied: cfe/trunk/lib/Index/USRGeneration.cpp (from r188600, cfe/trunk/lib/IDE/USRGeneration.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/USRGeneration.cpp?p2=cfe/trunk/lib/Index/USRGeneration.cpp&p1=cfe/trunk/lib/IDE/USRGeneration.cpp&r1=188600&r2=188601&rev=188601&view=diff
==============================================================================
--- cfe/trunk/lib/IDE/USRGeneration.cpp (original)
+++ cfe/trunk/lib/Index/USRGeneration.cpp Fri Aug 16 19:40:41 2013
@@ -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
// 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;
Modified: cfe/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Makefile?rev=188601&r1=188600&r2=188601&view=diff
==============================================================================
--- cfe/trunk/lib/Makefile (original)
+++ cfe/trunk/lib/Makefile Fri Aug 16 19:40:41 2013
@@ -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
Modified: cfe/trunk/tools/libclang/CIndexUSRs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndexUSRs.cpp?rev=188601&r1=188600&r2=188601&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndexUSRs.cpp (original)
+++ cfe/trunk/tools/libclang/CIndexUSRs.cpp Fri Aug 16 19:40:41 2013
@@ -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
}
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());
}
Modified: cfe/trunk/tools/libclang/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=188601&r1=188600&r2=188601&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CMakeLists.txt (original)
+++ cfe/trunk/tools/libclang/CMakeLists.txt Fri Aug 16 19:40:41 2013
@@ -44,7 +44,7 @@ set(SOURCES
)
set(LIBRARIES
- clangIDE
+ clangIndex
clangARCMigrate
clangRewriteCore
clangRewriteFrontend
Modified: cfe/trunk/tools/libclang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Makefile?rev=188601&r1=188600&r2=188601&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/Makefile (original)
+++ cfe/trunk/tools/libclang/Makefile Fri Aug 16 19:40:41 2013
@@ -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 \
More information about the cfe-commits
mailing list