Skip to content

Short-circuiting template conditions #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaloLorn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Short-circuiting template conditions #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7776f
Added short-circuit evaluation to subsystem template conditions.
DaloLorn Mar 20, 2022
70a1034
Updated Windows build runner. See https://github.com/actions/virtual-…
DaloLorn Mar 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
BUILD_CONFIGURATION: Non-Steam Release

name: Windows build
runs-on: windows-2016
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
Expand Down
7 changes: 3 additions & 4 deletions source/game/design/subsystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ struct TemplateBlock {
};

bool conditionMatches(const SubsystemDef* cur, std::vector<std::pair<int,std::string>>& conditions) {
bool passesAll = true;
foreach(c, conditions) {
int type = c->first;
bool negation = false;
Expand Down Expand Up @@ -458,14 +457,14 @@ bool conditionMatches(const SubsystemDef* cur, std::vector<std::pair<int,std::st

if(!negation) {
if(!pass)
passesAll = false;
return false;
}
else {
if(pass)
passesAll = false;
return false;
}
}
return passesAll;
return true;
}

void parseConditions(const std::string& value, std::vector<std::pair<int,std::string>>& conditions) {
Expand Down