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

ImportProject: Macro names in visual studio solutions/projects are case insensitive

This commit is contained in:
Daniel Marjamäki 2017-09-24 22:36:20 +02:00
parent 1b93e2fad9
commit 30e6a05aa0
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/importproject.cpp
View File

@ -30,6 +30,7 @@
#include <fstream> #include <fstream>
#include <utility> #include <utility>
void ImportProject::ignorePaths(const std::vector<std::string> &ipaths) void ImportProject::ignorePaths(const std::vector<std::string> &ipaths)
{ {
for (std::list<FileSettings>::iterator it = fileSettings.begin(); it != fileSettings.end();) { for (std::list<FileSettings>::iterator it = fileSettings.begin(); it != fileSettings.end();) {
@ -96,9 +97,9 @@ void ImportProject::FileSettings::setDefines(std::string defs)
defines.swap(defs); defines.swap(defs);
} }
static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std::string> &variables) static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std::string, cppcheck::stricmp> &variables)
{ {
std::set<std::string> expanded; std::set<std::string, cppcheck::stricmp> expanded;
std::string::size_type start = 0; std::string::size_type start = 0;
while ((start = s.find("$(")) != std::string::npos) { while ((start = s.find("$(")) != std::string::npos) {
std::string::size_type end = s.find(')',start); std::string::size_type end = s.find(')',start);
@ -108,7 +109,7 @@ static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std:
if (expanded.find(var) != expanded.end()) if (expanded.find(var) != expanded.end())
break; break;
expanded.insert(var); expanded.insert(var);
std::map<std::string, std::string>::const_iterator it1 = variables.find(var); std::map<std::string, std::string, cppcheck::stricmp>::const_iterator it1 = variables.find(var);
// variable was not found within defined variables // variable was not found within defined variables
if (it1 == variables.end()) { if (it1 == variables.end()) {
const char *envValue = std::getenv(var.c_str()); const char *envValue = std::getenv(var.c_str());
@ -127,7 +128,7 @@ static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std:
return true; return true;
} }
void ImportProject::FileSettings::setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string> &variables) void ImportProject::FileSettings::setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables)
{ {
std::list<std::string> I; std::list<std::string> I;
// only parse each includePath once - so remove duplicates // only parse each includePath once - so remove duplicates
@ -177,7 +178,7 @@ void ImportProject::import(const std::string &filename)
path += '/'; path += '/';
importSln(fin,path); importSln(fin,path);
} else if (filename.find(".vcxproj") != std::string::npos) { } else if (filename.find(".vcxproj") != std::string::npos) {
std::map<std::string, std::string> variables; std::map<std::string, std::string, cppcheck::stricmp> variables;
importVcxproj(filename, variables, emptyString); importVcxproj(filename, variables, emptyString);
} }
} }
@ -240,7 +241,7 @@ void ImportProject::importCompileCommands(std::istream &istr)
fs.systemIncludePaths.push_back(isystem); fs.systemIncludePaths.push_back(isystem);
} }
} }
std::map<std::string, std::string> variables; std::map<std::string, std::string, cppcheck::stricmp> variables;
fs.setIncludePaths(directory, fs.includePaths, variables); fs.setIncludePaths(directory, fs.includePaths, variables);
fs.setDefines(fs.defines); fs.setDefines(fs.defines);
fileSettings.push_back(fs); fileSettings.push_back(fs);
@ -252,7 +253,7 @@ void ImportProject::importCompileCommands(std::istream &istr)
void ImportProject::importSln(std::istream &istr, const std::string &path) void ImportProject::importSln(std::istream &istr, const std::string &path)
{ {
std::map<std::string,std::string> variables; std::map<std::string,std::string,cppcheck::stricmp> variables;
variables["SolutionDir"] = path; variables["SolutionDir"] = path;
std::string line; std::string line;
@ -374,7 +375,7 @@ static std::list<std::string> toStringList(const std::string &s)
return ret; return ret;
} }
static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::string,std::string> *variables, std::string *includePath, bool *useOfMfc) static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::string,std::string,cppcheck::stricmp> *variables, std::string *includePath, bool *useOfMfc)
{ {
if (useOfMfc) { if (useOfMfc) {
for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) { for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
@ -409,7 +410,7 @@ static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::
} }
} }
static void loadVisualStudioProperties(const std::string &props, std::map<std::string,std::string> *variables, std::string *includePath, const std::string &additionalIncludeDirectories, std::list<ItemDefinitionGroup> &itemDefinitionGroupList) static void loadVisualStudioProperties(const std::string &props, std::map<std::string,std::string,cppcheck::stricmp> *variables, std::string *includePath, const std::string &additionalIncludeDirectories, std::list<ItemDefinitionGroup> &itemDefinitionGroupList)
{ {
std::string filename(props); std::string filename(props);
if (!simplifyPathWithVariables(filename, *variables)) if (!simplifyPathWithVariables(filename, *variables))
@ -445,7 +446,7 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
} }
} }
void ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string> &variables, const std::string &additionalIncludeDirectories) void ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories)
{ {
variables["ProjectDir"] = Path::simplifyPath(Path::getPathFromFilename(filename)); variables["ProjectDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));

21
lib/importproject.h
View File

@ -29,10 +29,27 @@
#include <set> #include <set>
#include <string> #include <string>
#include <vector> #include <vector>
#include <cctype>
/// @addtogroup Core /// @addtogroup Core
/// @{ /// @{
namespace cppcheck {
struct stricmp {
bool operator()(const std::string &lhs, const std::string &rhs) const {
if (lhs.size() != rhs.size())
return lhs.size() < rhs.size();
for (unsigned int i = 0; i < lhs.size(); ++i) {
char c1 = std::toupper((unsigned char)lhs[i]);
char c2 = std::toupper((unsigned char)rhs[i]);
if (c1 != c2)
return c1 < c2;
}
return false;
}
};
}
/** /**
* @brief Importing project settings. * @brief Importing project settings.
*/ */
@ -56,7 +73,7 @@ public:
bool useMfc; bool useMfc;
void setDefines(std::string defs); void setDefines(std::string defs);
void setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string> &variables); void setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables);
}; };
std::list<FileSettings> fileSettings; std::list<FileSettings> fileSettings;
@ -68,7 +85,7 @@ public:
private: private:
void importCompileCommands(std::istream &istr); void importCompileCommands(std::istream &istr);
void importSln(std::istream &istr, const std::string &path); void importSln(std::istream &istr, const std::string &path);
void importVcxproj(const std::string &filename, std::map<std::string, std::string> &variables, const std::string &additionalIncludeDirectories); void importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories);
}; };
/// @} /// @}