Rework compile_commands.json import #8030
+257
−141
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -42,6 +42,148 @@ | |||||
|
|
||||||
| #include "json.h" | ||||||
|
|
||||||
| std::string ImportProject::collectArgs(const std::string &cmd, std::vector<std::string> &args) | ||||||
| { | ||||||
| args.clear(); | ||||||
|
|
||||||
| std::string::size_type pos = 0; | ||||||
| const std::string::size_type end = cmd.size(); | ||||||
| std::string arg; | ||||||
|
|
||||||
| bool inDoubleQuotes = false; | ||||||
| bool inSingleQuotes = false; | ||||||
|
|
||||||
| while (pos < end) { | ||||||
| char c = cmd[pos++]; | ||||||
|
|
||||||
| if (c == ' ') { | ||||||
| if (inDoubleQuotes || inSingleQuotes) { | ||||||
| arg.push_back(c); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!arg.empty()) | ||||||
| args.push_back(arg); | ||||||
| arg.clear(); | ||||||
|
|
||||||
| pos = cmd.find_first_not_of(' ', pos); | ||||||
|
|
||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (c == '\"' && !inSingleQuotes) { | ||||||
| inDoubleQuotes = !inDoubleQuotes; | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (c == '\'' && !inDoubleQuotes) { | ||||||
| inSingleQuotes = !inSingleQuotes; | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (c == '\\' && !inSingleQuotes) { | ||||||
| if (pos == end) { | ||||||
| arg.push_back('\\'); | ||||||
| break; | ||||||
| } | ||||||
|
|
||||||
| c = cmd[pos++]; | ||||||
|
|
||||||
| if (!std::strchr("\\\"\' ", c)) | ||||||
| arg.push_back('\\'); | ||||||
|
|
||||||
| arg.push_back(c); | ||||||
| continue; | ||||||
danmar marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
|
|
||||||
| arg.push_back(c); | ||||||
| } | ||||||
|
|
||||||
| if (inSingleQuotes || inDoubleQuotes) | ||||||
| return "Missing closing quote in command string"; | ||||||
|
|
||||||
| if (!arg.empty()) | ||||||
| args.push_back(arg); | ||||||
|
|
||||||
| return ""; | ||||||
| } | ||||||
|
|
||||||
| void ImportProject::parseArgs(FileSettings &fs, const std::vector<std::string> &args) | ||||||
| { | ||||||
| const auto getOptArg = [&args](std::initializer_list<std::string> optNames, | ||||||
|
Owner
There was a problem hiding this comment. I suggest
Suggested change
Collaborator
Author
There was a problem hiding this comment. From cppreference:
Since we are not modifying these lists in any way I think it's unnecessary to use a vector. |
||||||
| std::size_t &i) { | ||||||
| const auto &arg = args[i]; | ||||||
| const auto *const it = std::find_if(optNames.begin(), | ||||||
| optNames.end(), | ||||||
| [&arg] (const std::string &optName) { | ||||||
| return startsWith(arg, optName); | ||||||
| }); | ||||||
|
|
||||||
| if (it == optNames.end()) | ||||||
| return std::string(); | ||||||
|
|
||||||
| const std::size_t optLen = it->size(); | ||||||
| if (arg.size() == optLen) | ||||||
| return ++i >= args.size() ? std::string() : args[i]; | ||||||
|
|
||||||
| return arg.substr(optLen); | ||||||
| }; | ||||||
|
|
||||||
| std::string defs; | ||||||
| for (std::size_t i = 0; i < args.size(); i++) { | ||||||
| std::string optArg; | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-I", "/I" }, i)).empty()) { | ||||||
| if (std::none_of(fs.includePaths.cbegin(), fs.includePaths.cend(), | ||||||
| [&](const std::string &path) { | ||||||
| return path == optArg; | ||||||
| })) | ||||||
| fs.includePaths.push_back(std::move(optArg)); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-isystem" }, i)).empty()) { | ||||||
| fs.systemIncludePaths.push_back(std::move(optArg)); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-D", "/D" }, i)).empty()) { | ||||||
| defs += optArg + ";"; | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-U", "/U" }, i)).empty()) { | ||||||
| fs.undefs.insert(std::move(optArg)); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-std=", "/std:" }, i)).empty()) { | ||||||
| fs.standard = std::move(optArg); | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-f" }, i)).empty()) { | ||||||
| if (optArg == "pic") | ||||||
| defs += "__pic__;"; | ||||||
| else if (optArg == "PIC") | ||||||
| defs += "__PIC__;"; | ||||||
| else if (optArg == "pie") | ||||||
| defs += "__pie__;"; | ||||||
| else if (optArg == "PIE") | ||||||
| defs += "__PIE__;"; | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| if (!(optArg = getOptArg({ "-m" }, i)).empty()) { | ||||||
| if (optArg == "unicode") | ||||||
| defs += "UNICODE;"; | ||||||
| continue; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| fsSetDefines(fs, std::move(defs)); | ||||||
| } | ||||||
|
|
||||||
| void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug) | ||||||
| { | ||||||
| PathMatch matcher(ipaths, Path::getCurrentPath()); | ||||||
|
|
@@ -210,134 +352,6 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings | |||||
| return ImportProject::Type::FAILURE; | ||||||
| } | ||||||
|
|
||||||
| bool ImportProject::importCompileCommands(std::istream &istr) | ||||||
| { | ||||||
| picojson::value compileCommands; | ||||||
|
|
@@ -371,31 +385,31 @@ bool ImportProject::importCompileCommands(std::istream &istr) | |||||
|
|
||||||
| const std::string directory = std::move(dirpath); | ||||||
|
|
||||||
| std::vector<std::string> arguments; | ||||||
| if (obj.count("arguments")) { | ||||||
| if (obj["arguments"].is<picojson::array>()) { | ||||||
| for (const picojson::value& arg : obj["arguments"].get<picojson::array>()) { | ||||||
| if (arg.is<std::string>()) | ||||||
| arguments.push_back(arg.get<std::string>()); | ||||||
| } | ||||||
| } else { | ||||||
| errors.emplace_back("'arguments' field in compilation database entry is not a JSON array"); | ||||||
| return false; | ||||||
| } | ||||||
| } else if (obj.count("command")) { | ||||||
| std::string command; | ||||||
| if (obj["command"].is<std::string>()) { | ||||||
| command = obj["command"].get<std::string>(); | ||||||
| } else { | ||||||
| errors.emplace_back("'command' field in compilation database entry is not a string"); | ||||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| std::string error = collectArgs(command, arguments); | ||||||
| if (!error.empty()) { | ||||||
| errors.emplace_back(error); | ||||||
| return false; | ||||||
| } | ||||||
| } else { | ||||||
| errors.emplace_back("no 'arguments' or 'command' field found in compilation database entry"); | ||||||
| return false; | ||||||
|
|
@@ -425,7 +439,7 @@ bool ImportProject::importCompileCommands(std::istream &istr) | |||||
| else | ||||||
| path = Path::simplifyPath(directory + file); | ||||||
| FileSettings fs{path, Standards::Language::None, 0}; // file will be identified later on | ||||||
| parseArgs(fs, arguments); | ||||||
| std::map<std::string, std::string, cppcheck::stricmp> variables; | ||||||
| fsSetIncludePaths(fs, directory, fs.includePaths, variables); | ||||||
| // Assign a unique index to each file path. If the file path already exists in the map, | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.