diff options
| -rw-r--r-- | include/clang-c/Index.h | 17 | ||||
| -rw-r--r-- | tools/CIndex/CIndex.cpp | 23 | ||||
| -rw-r--r-- | tools/c-index-test/c-index-test.c | 2 |
3 files changed, 32 insertions, 10 deletions
diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h index b80cd47e01..b9a982ec0c 100644 --- a/include/clang-c/Index.h +++ b/include/clang-c/Index.h @@ -107,15 +107,26 @@ void clang_disposeIndex(CXIndex); const char *clang_getTranslationUnitSpelling(CXTranslationUnit CTUnit); CXTranslationUnit clang_createTranslationUnit( - CXIndex, const char *ast_filename + CXIndex, const char *ast_filename, + int displayDiagnostics ); + +/** + * \brief Destroy the specified CXTranslationUnit object. + */ +void clang_disposeTranslationUnit(CXTranslationUnit); + +/** + * \brief Return the CXTranslationUnit for a given source file and the provided command line + * arguments one would pass to the compiler. + */ CXTranslationUnit clang_createTranslationUnitFromSourceFile( CXIndex CIdx, const char *source_filename, int num_clang_command_line_args, - const char **clang_command_line_args + const char **clang_command_line_args, + int displayDiagnostics ); -void clang_disposeTranslationUnit(CXTranslationUnit); /** * \brief Indicate to Clang that it should only enumerate "local" declarations diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp index 3f3fc8c3d3..77e7589269 100644 --- a/tools/CIndex/CIndex.cpp +++ b/tools/CIndex/CIndex.cpp @@ -350,15 +350,16 @@ void clang_disposeIndex(CXIndex CIdx) // FIXME: need to pass back error info. CXTranslationUnit clang_createTranslationUnit( - CXIndex CIdx, const char *ast_filename) + CXIndex CIdx, const char *ast_filename, int displayDiagnostics) { assert(CIdx && "Passed null CXIndex"); CIndexer *CXXIdx = static_cast<CIndexer *>(CIdx); std::string astName(ast_filename); std::string ErrMsg; + DiagnosticClient *diagClient = displayDiagnostics + ? NULL : new IgnoreDiagnosticsClient(); - return ASTUnit::LoadFromPCHFile(astName, &ErrMsg, - new IgnoreDiagnosticsClient(), + return ASTUnit::LoadFromPCHFile(astName, &ErrMsg, diagClient, CXXIdx->getOnlyLocalDecls(), /* UseBumpAllocator = */ true); } @@ -366,8 +367,8 @@ CXTranslationUnit clang_createTranslationUnit( CXTranslationUnit clang_createTranslationUnitFromSourceFile( CXIndex CIdx, const char *source_filename, - int num_command_line_args, const char **command_line_args) -{ + int num_command_line_args, const char **command_line_args, + int displayDiagnostics) { // Build up the arguments for involing clang. llvm::sys::Path ClangPath = static_cast<CIndexer *>(CIdx)->getClangPath(); std::vector<const char *> argv; @@ -383,11 +384,21 @@ CXTranslationUnit clang_createTranslationUnitFromSourceFile( argv.push_back(NULL); // Generate the AST file in a separate process. +#ifdef LLVM_ON_WIN32 + llvm::sys::Path DevNull("/dev/null") + llvm::sys::Path *Redirects[] = { &DevNull, &DevNull, &DevNull, NULL }; + llvm::sys::Program::ExecuteAndWait(ClangPath, &argv[0], + !displayDiagnostics ? Redirects : NULL); +#else + // FIXME: I don't know what is the equivalent '/dev/null' redirect for + // Windows for this API. llvm::sys::Program::ExecuteAndWait(ClangPath, &argv[0]); +#endif // Finally, we create the translation unit from the ast file. ASTUnit *ATU = static_cast<ASTUnit *>( - clang_createTranslationUnit(CIdx, astTmpFile)); + clang_createTranslationUnit(CIdx, astTmpFile, + displayDiagnostics)); ATU->unlinkTemporaryFile(); return ATU; } diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c index fc84faac2b..29cd1370e5 100644 --- a/tools/c-index-test/c-index-test.c +++ b/tools/c-index-test/c-index-test.c @@ -96,7 +96,7 @@ int main(int argc, char **argv) { if (!strcmp(argv[2], "local")) clang_wantOnlyLocalDeclarations(Idx); - TU = clang_createTranslationUnit(Idx, argv[1]); + TU = clang_createTranslationUnit(Idx, argv[1], /* displayDiagnostics= */ 1); if (!TU) { fprintf(stderr, "Unable to load translation unit!\n"); |