walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Clang import; Write error message when Clang is not in path

This commit is contained in:
Daniel Marjamäki 2020-01-27 18:26:02 +01:00
parent beac835180
commit 37f4ec5bbe
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/cppcheck.cpp
View File

@ -258,14 +258,13 @@ unsigned int CppCheck::check(const std::string &path)
const std::string clangcmd = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, "") + ".clang-cmd"; const std::string clangcmd = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, "") + ".clang-cmd";
const std::string clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, "") + ".clang-stderr"; const std::string clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, "") + ".clang-stderr";
/* Experimental: import clang ast dump */
const std::string cmd1 = clang + " -v -fsyntax-only " + temp + " 2>&1"; const std::string cmd1 = clang + " -v -fsyntax-only " + temp + " 2>&1";
const std::pair<bool, std::string> res1 = executeCommand(cmd1); const std::pair<bool, std::string> &result1 = executeCommand(cmd1);
if (!res1.first) { if (!result1.first || result1.second.find(" -cc1 ") == std::string::npos) {
std::cerr << "Failed to execute '" + cmd1 + "'" << std::endl; std::cerr << "Failed to execute '" + cmd1 + "'" << std::endl;
return 0; return 0;
} }
std::istringstream details(res1.second); std::istringstream details(result1.second);
std::string line; std::string line;
std::string flags; std::string flags;
while (std::getline(details, line)) { while (std::getline(details, line)) {
@ -288,8 +287,8 @@ unsigned int CppCheck::check(const std::string &path)
fout << cmd << std::endl; fout << cmd << std::endl;
fout.close(); fout.close();
std::pair<bool, std::string> res = executeCommand(cmd); const std::pair<bool, std::string> &result2 = executeCommand(cmd);
if (!res.first) { if (!result2.first || result2.second.find("TranslationUnitDecl") == std::string::npos) {
std::cerr << "Failed to execute '" + cmd + "'" << std::endl; std::cerr << "Failed to execute '" + cmd + "'" << std::endl;
return 0; return 0;
} }
@ -332,8 +331,8 @@ unsigned int CppCheck::check(const std::string &path)
} }
} }
//std::cout << "Checking Clang ast dump:\n" << res.second << std::endl; //std::cout << "Checking Clang ast dump:\n" << result2.second << std::endl;
std::istringstream ast(res.second); std::istringstream ast(result2.second);
Tokenizer tokenizer(&mSettings, this); Tokenizer tokenizer(&mSettings, this);
tokenizer.list.appendFileIfNew(path); tokenizer.list.appendFileIfNew(path);
clangimport::parseClangAstDump(&tokenizer, ast); clangimport::parseClangAstDump(&tokenizer, ast);