diff options
Diffstat (limited to 'clang/tools/libclang')
22 files changed, 54 insertions, 72 deletions
diff --git a/clang/tools/libclang/ARCMigrate.cpp b/clang/tools/libclang/ARCMigrate.cpp index 5ee5cf6e4ef..649408326c3 100644 --- a/clang/tools/libclang/ARCMigrate.cpp +++ b/clang/tools/libclang/ARCMigrate.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "clang-c/Index.h" - #include "CXString.h" #include "clang/ARCMigrate/ARCMT.h" #include "clang/Frontend/TextDiagnosticBuffer.h" diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 81179bd455a..c0f3f571a4a 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -13,40 +13,38 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" +#include "CIndexDiagnostic.h" #include "CXComment.h" #include "CXCursor.h" -#include "CXTranslationUnit.h" +#include "CXSourceLocation.h" #include "CXString.h" +#include "CXTranslationUnit.h" #include "CXType.h" -#include "CXSourceLocation.h" -#include "CIndexDiagnostic.h" #include "CursorVisitor.h" - -#include "clang/Basic/Version.h" - #include "clang/AST/StmtVisitor.h" #include "clang/Basic/Diagnostic.h" +#include "clang/Basic/Version.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" -#include "clang/Lex/Lexer.h" #include "clang/Lex/HeaderSearch.h" +#include "clang/Lex/Lexer.h" #include "clang/Lex/PreprocessingRecord.h" #include "clang/Lex/Preprocessor.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Optional.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/Support/SaveAndRestore.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/CrashRecoveryContext.h" -#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Timer.h" #include "llvm/Support/Mutex.h" +#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Program.h" +#include "llvm/Support/SaveAndRestore.h" #include "llvm/Support/Signals.h" #include "llvm/Support/Threading.h" -#include "llvm/Support/Compiler.h" +#include "llvm/Support/Timer.h" +#include "llvm/Support/raw_ostream.h" using namespace clang; using namespace clang::cxcursor; diff --git a/clang/tools/libclang/CIndexCodeCompletion.cpp b/clang/tools/libclang/CIndexCodeCompletion.cpp index 67e64c4e232..456c4778516 100644 --- a/clang/tools/libclang/CIndexCodeCompletion.cpp +++ b/clang/tools/libclang/CIndexCodeCompletion.cpp @@ -13,16 +13,16 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" -#include "CXTranslationUnit.h" -#include "CXString.h" +#include "CIndexDiagnostic.h" #include "CXCursor.h" #include "CXString.h" -#include "CIndexDiagnostic.h" -#include "clang/AST/Type.h" +#include "CXString.h" +#include "CXTranslationUnit.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclObjC.h" -#include "clang/Basic/SourceManager.h" +#include "clang/AST/Type.h" #include "clang/Basic/FileManager.h" +#include "clang/Basic/SourceManager.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" @@ -32,11 +32,11 @@ #include "llvm/Support/Atomic.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/Program.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Program.h" -#include <cstdlib> #include <cstdio> +#include <cstdlib> #ifdef UDP_CODE_COMPLETION_LOGGER diff --git a/clang/tools/libclang/CIndexHigh.cpp b/clang/tools/libclang/CIndexHigh.cpp index ec76898cc83..43f20240799 100644 --- a/clang/tools/libclang/CIndexHigh.cpp +++ b/clang/tools/libclang/CIndexHigh.cpp @@ -11,9 +11,8 @@ #include "CXCursor.h" #include "CXSourceLocation.h" #include "CXTranslationUnit.h" - -#include "clang/Frontend/ASTUnit.h" #include "clang/AST/DeclObjC.h" +#include "clang/Frontend/ASTUnit.h" using namespace clang; using namespace cxcursor; diff --git a/clang/tools/libclang/CIndexInclusionStack.cpp b/clang/tools/libclang/CIndexInclusionStack.cpp index 848ca31a5e3..f613f0f1c5b 100644 --- a/clang/tools/libclang/CIndexInclusionStack.cpp +++ b/clang/tools/libclang/CIndexInclusionStack.cpp @@ -13,8 +13,8 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" -#include "CXTranslationUnit.h" #include "CXSourceLocation.h" +#include "CXTranslationUnit.h" #include "clang/AST/DeclVisitor.h" #include "clang/Frontend/ASTUnit.h" #include "llvm/ADT/SmallString.h" diff --git a/clang/tools/libclang/CIndexer.cpp b/clang/tools/libclang/CIndexer.cpp index d45878919e4..d89e0a41984 100644 --- a/clang/tools/libclang/CIndexer.cpp +++ b/clang/tools/libclang/CIndexer.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "CIndexer.h" - #include "clang/AST/Decl.h" #include "clang/AST/DeclVisitor.h" #include "clang/AST/StmtVisitor.h" @@ -24,12 +23,11 @@ #include "llvm/Config/llvm-config.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/Program.h" - +#include "llvm/Support/raw_ostream.h" #include <cstdio> -#include <vector> #include <sstream> +#include <vector> #ifdef __CYGWIN__ #include <cygwin/version.h> diff --git a/clang/tools/libclang/CXComment.cpp b/clang/tools/libclang/CXComment.cpp index fa149a0ff9d..8c8fe74bba5 100644 --- a/clang/tools/libclang/CXComment.cpp +++ b/clang/tools/libclang/CXComment.cpp @@ -12,19 +12,16 @@ //===----------------------------------------------------------------------===// #include "clang-c/Index.h" -#include "CXString.h" #include "CXComment.h" #include "CXCursor.h" - -#include "clang/AST/PrettyPrinter.h" -#include "clang/AST/CommentVisitor.h" +#include "CXString.h" #include "clang/AST/CommentCommandTraits.h" +#include "clang/AST/CommentVisitor.h" #include "clang/AST/Decl.h" - +#include "clang/AST/PrettyPrinter.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" - #include <climits> using namespace clang; diff --git a/clang/tools/libclang/CXComment.h b/clang/tools/libclang/CXComment.h index 513431709f4..126227f8d76 100644 --- a/clang/tools/libclang/CXComment.h +++ b/clang/tools/libclang/CXComment.h @@ -14,11 +14,10 @@ #ifndef LLVM_CLANG_CXCOMMENT_H #define LLVM_CLANG_CXCOMMENT_H -#include "clang-c/Index.h" #include "CXTranslationUnit.h" - -#include "clang/AST/Comment.h" +#include "clang-c/Index.h" #include "clang/AST/ASTContext.h" +#include "clang/AST/Comment.h" #include "clang/Frontend/ASTUnit.h" namespace clang { diff --git a/clang/tools/libclang/CXCompilationDatabase.cpp b/clang/tools/libclang/CXCompilationDatabase.cpp index 7216307a96a..68845932d58 100644 --- a/clang/tools/libclang/CXCompilationDatabase.cpp +++ b/clang/tools/libclang/CXCompilationDatabase.cpp @@ -1,6 +1,6 @@ #include "clang-c/CXCompilationDatabase.h" -#include "clang/Tooling/CompilationDatabase.h" #include "CXString.h" +#include "clang/Tooling/CompilationDatabase.h" using namespace clang; using namespace clang::tooling; diff --git a/clang/tools/libclang/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp index 8d3e1690edc..6615e4a6f42 100644 --- a/clang/tools/libclang/CXCursor.cpp +++ b/clang/tools/libclang/CXCursor.cpp @@ -15,9 +15,9 @@ #include "CXTranslationUnit.h" #include "CXCursor.h" -#include "CXType.h" #include "CXString.h" -#include "clang/Frontend/ASTUnit.h" +#include "CXType.h" +#include "clang-c/Index.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclObjC.h" @@ -25,7 +25,7 @@ #include "clang/AST/Expr.h" #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" -#include "clang-c/Index.h" +#include "clang/Frontend/ASTUnit.h" #include "llvm/Support/ErrorHandling.h" using namespace clang; diff --git a/clang/tools/libclang/CXSourceLocation.cpp b/clang/tools/libclang/CXSourceLocation.cpp index a6bf8fcf1cc..53b8a333f05 100644 --- a/clang/tools/libclang/CXSourceLocation.cpp +++ b/clang/tools/libclang/CXSourceLocation.cpp @@ -12,12 +12,11 @@ //===----------------------------------------------------------------------===// #include "clang/Frontend/ASTUnit.h" - #include "CIndexer.h" -#include "CXString.h" +#include "CXLoadedDiagnostic.h" #include "CXSourceLocation.h" +#include "CXString.h" #include "CXTranslationUnit.h" -#include "CXLoadedDiagnostic.h" using namespace clang; using namespace clang::cxstring; diff --git a/clang/tools/libclang/CXSourceLocation.h b/clang/tools/libclang/CXSourceLocation.h index 6c5e858aaae..735629d2c2d 100644 --- a/clang/tools/libclang/CXSourceLocation.h +++ b/clang/tools/libclang/CXSourceLocation.h @@ -15,9 +15,9 @@ #define LLVM_CLANG_CXSOURCELOCATION_H #include "clang-c/Index.h" -#include "clang/Basic/SourceLocation.h" -#include "clang/Basic/LangOptions.h" #include "clang/AST/ASTContext.h" +#include "clang/Basic/LangOptions.h" +#include "clang/Basic/SourceLocation.h" namespace clang { diff --git a/clang/tools/libclang/CXString.cpp b/clang/tools/libclang/CXString.cpp index bb09cd5cdc2..c4ab3f4f1bf 100644 --- a/clang/tools/libclang/CXString.cpp +++ b/clang/tools/libclang/CXString.cpp @@ -15,8 +15,8 @@ #include "CXString.h" #include "CXTranslationUnit.h" -#include "clang/Frontend/ASTUnit.h" #include "clang-c/Index.h" +#include "clang/Frontend/ASTUnit.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ErrorHandling.h" diff --git a/clang/tools/libclang/CXString.h b/clang/tools/libclang/CXString.h index c354bd2334e..73d94f6bbb2 100644 --- a/clang/tools/libclang/CXString.h +++ b/clang/tools/libclang/CXString.h @@ -16,8 +16,8 @@ #include "clang-c/Index.h" #include "clang/Basic/LLVM.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/StringRef.h" namespace clang { namespace cxstring { diff --git a/clang/tools/libclang/CXType.cpp b/clang/tools/libclang/CXType.cpp index 4e031d2d550..c4b8a09a547 100644 --- a/clang/tools/libclang/CXType.cpp +++ b/clang/tools/libclang/CXType.cpp @@ -12,15 +12,15 @@ //===--------------------------------------------------------------------===// #include "CIndexer.h" -#include "CXTranslationUnit.h" #include "CXCursor.h" #include "CXString.h" +#include "CXTranslationUnit.h" #include "CXType.h" -#include "clang/AST/Expr.h" -#include "clang/AST/Type.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclObjC.h" #include "clang/AST/DeclTemplate.h" +#include "clang/AST/Expr.h" +#include "clang/AST/Type.h" #include "clang/Frontend/ASTUnit.h" using namespace clang; diff --git a/clang/tools/libclang/CursorVisitor.h b/clang/tools/libclang/CursorVisitor.h index 7cf75086b9b..fa978b7647f 100644 --- a/clang/tools/libclang/CursorVisitor.h +++ b/clang/tools/libclang/CursorVisitor.h @@ -10,10 +10,9 @@ #ifndef LLVM_CLANG_LIBCLANG_CURSORVISITOR_H #define LLVM_CLANG_LIBCLANG_CURSORVISITOR_H -#include "Index_Internal.h" #include "CXCursor.h" #include "CXTranslationUnit.h" - +#include "Index_Internal.h" #include "clang/AST/DeclVisitor.h" #include "clang/AST/TypeLocVisitor.h" diff --git a/clang/tools/libclang/IndexBody.cpp b/clang/tools/libclang/IndexBody.cpp index 3614206dee9..95d74efc04e 100644 --- a/clang/tools/libclang/IndexBody.cpp +++ b/clang/tools/libclang/IndexBody.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" - #include "RecursiveASTVisitor.h" using namespace clang; diff --git a/clang/tools/libclang/IndexDecl.cpp b/clang/tools/libclang/IndexDecl.cpp index 4b6706fba78..79283499831 100644 --- a/clang/tools/libclang/IndexDecl.cpp +++ b/clang/tools/libclang/IndexDecl.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" - #include "clang/AST/DeclVisitor.h" using namespace clang; diff --git a/clang/tools/libclang/IndexTypeSourceInfo.cpp b/clang/tools/libclang/IndexTypeSourceInfo.cpp index 67a06f24988..2c771c854ce 100644 --- a/clang/tools/libclang/IndexTypeSourceInfo.cpp +++ b/clang/tools/libclang/IndexTypeSourceInfo.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" - #include "RecursiveASTVisitor.h" using namespace clang; diff --git a/clang/tools/libclang/Indexing.cpp b/clang/tools/libclang/Indexing.cpp index 714a36ebddf..a907c14e226 100644 --- a/clang/tools/libclang/Indexing.cpp +++ b/clang/tools/libclang/Indexing.cpp @@ -8,25 +8,24 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" +#include "CIndexDiagnostic.h" +#include "CIndexer.h" #include "CXCursor.h" #include "CXSourceLocation.h" -#include "CXTranslationUnit.h" #include "CXString.h" -#include "CIndexDiagnostic.h" -#include "CIndexer.h" - +#include "CXTranslationUnit.h" +#include "clang/AST/ASTConsumer.h" +#include "clang/AST/DeclVisitor.h" #include "clang/Frontend/ASTUnit.h" -#include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/CompilerInstance.h" +#include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/Utils.h" -#include "clang/Sema/SemaConsumer.h" -#include "clang/AST/ASTConsumer.h" -#include "clang/AST/DeclVisitor.h" -#include "clang/Lex/Preprocessor.h" #include "clang/Lex/PPCallbacks.h" -#include "llvm/Support/MemoryBuffer.h" +#include "clang/Lex/Preprocessor.h" +#include "clang/Sema/SemaConsumer.h" #include "llvm/Support/CrashRecoveryContext.h" +#include "llvm/Support/MemoryBuffer.h" using namespace clang; using namespace cxstring; diff --git a/clang/tools/libclang/IndexingContext.cpp b/clang/tools/libclang/IndexingContext.cpp index d4daa49de91..8ba1854baaa 100644 --- a/clang/tools/libclang/IndexingContext.cpp +++ b/clang/tools/libclang/IndexingContext.cpp @@ -8,12 +8,11 @@ //===----------------------------------------------------------------------===// #include "IndexingContext.h" -#include "CXTranslationUnit.h" #include "CIndexDiagnostic.h" - -#include "clang/Frontend/ASTUnit.h" +#include "CXTranslationUnit.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclTemplate.h" +#include "clang/Frontend/ASTUnit.h" using namespace clang; using namespace cxindex; diff --git a/clang/tools/libclang/IndexingContext.h b/clang/tools/libclang/IndexingContext.h index 0fc7238ee23..15db83d9bb8 100644 --- a/clang/tools/libclang/IndexingContext.h +++ b/clang/tools/libclang/IndexingContext.h @@ -7,11 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "Index_Internal.h" #include "CXCursor.h" - -#include "clang/AST/DeclObjC.h" +#include "Index_Internal.h" #include "clang/AST/DeclGroup.h" +#include "clang/AST/DeclObjC.h" #include "llvm/ADT/DenseSet.h" #include <deque> |
