thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CREATE_PROJECT: Add fix for nested ifs

Browse source 
This adds a quick fix so that any if blocks nested inside a if block
with an unmet condition are handled with push(false) even if their
condition is satisfied.

For example, without this modification, upon running create_project.exe
--msvc --disable-cloud --enable-libcurl the block inside

ifdef USE_CLOUD
ifdef USE_LIBCURL
...
endif
endif

in backends/module.mk would get evaluated since it was inside
USE_LIBCURL (=1), leading to unpredictable results.
This commit is contained in:
Tobia Tesan 2017-06-21 18:40:07 +02:00
parent c4ca324533
commit c19c10d548
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
devtools/create_project/create_project.cpp
View file

@ -1770,18 +1770,20 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin
if (std::find(defines.begin(), defines.end(), *i) == defines.end())
shouldInclude.push(false);
else
shouldInclude.push(true);
shouldInclude.push(true && shouldInclude.top());
} else if (*i == "ifndef") {
if (tokens.size() < 2)
error("Malformed ifndef in " + moduleMkFile);
++i;
if (std::find(defines.begin(), defines.end(), *i) == defines.end())
shouldInclude.push(true);
shouldInclude.push(true && shouldInclude.top());
else
shouldInclude.push(false);
} else if (*i == "else") {
shouldInclude.top() = !shouldInclude.top();
bool last = shouldInclude.top();
shouldInclude.pop();
shouldInclude.push(!last && shouldInclude.top());
} else if (*i == "endif") {
if (shouldInclude.size() <= 1)
error("endif without ifdef found in " + moduleMkFile);