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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2019-04-16 19:07:44 +02:00
parent 253f2c9e9d
commit f26b15e5b5
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/importproject.cpp
View File

@ -342,24 +342,21 @@ void ImportProject::importCompileCommands(std::istream &istr)
const std::string directory = dirpath; const std::string directory = dirpath;
std::ostringstream comm; std::ostringstream comm;
if( obj.find( "arguments" ) != obj.end() ) { if (obj.find("arguments") != obj.end()) {
if( obj[ "arguments" ].is< picojson::array >() ) { if (obj[ "arguments" ].is< picojson::array >()) {
for( const picojson::value& arg : obj[ "arguments" ].get< picojson::array >() ) { for (const picojson::value& arg : obj[ "arguments" ].get< picojson::array >()) {
if( arg.is< std::string >() ) { if (arg.is< std::string >()) {
comm << arg.get< std::string >() << " "; comm << arg.get< std::string >() << " ";
} }
} }
} } else {
else {
return; return;
} }
} } else if (obj.find("command") != obj.end()) {
else if( obj.find( "command" ) != obj.end() ) { if (obj[ "command" ].is< std::string >()) {
if( obj[ "command" ].is< std::string >() ) {
comm << obj[ "command" ].get< std::string >(); comm << obj[ "command" ].get< std::string >();
} }
} } else {
else {
return; return;
} }

2
test/testimportproject.cpp
View File

@ -47,7 +47,7 @@ private:
TEST_CASE(importCompileCommands2); // #8563 TEST_CASE(importCompileCommands2); // #8563
TEST_CASE(importCompileCommands3); // check with existing trailing / in directory TEST_CASE(importCompileCommands3); // check with existing trailing / in directory
TEST_CASE(importCompileCommands4); // only accept certain file types TEST_CASE(importCompileCommands4); // only accept certain file types
TEST_CASE(importCompileCommandsArgumentsSection); // Handle arguments section TEST_CASE(importCompileCommandsArgumentsSection); // Handle arguments section
TEST_CASE(importCompileCommandsNoCommandSection); // gracefully handles malformed json TEST_CASE(importCompileCommandsNoCommandSection); // gracefully handles malformed json
TEST_CASE(importCppcheckGuiProject); TEST_CASE(importCppcheckGuiProject);
} }