jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-20 09:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor refactor #2

Browse source
This commit is contained in:
ZeldaZach 2024-12-15 01:56:22 -05:00 • committed by Zach Halpern
parent 8df623623e
commit 45d329b707
2 changed files with 397 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cockatrice/src/game/filters/filter_string.cpp
View file

@ -70,8 +70,8 @@ static void setupParserRules()
search["Start"] = passthru; search["Start"] = passthru;
search["QueryPartList"] = [](const peg::SemanticValues &sv) -> Filter { search["QueryPartList"] = [](const peg::SemanticValues &sv) -> Filter {
return [=](const CardData& x) { return [=](const CardData& x) {
for (int i = 0; i < static_cast<int>(sv.size()); ++i) { for (const auto & i : sv) {
if (!std::any_cast<Filter>(sv[i])(x)) if (!std::any_cast<Filter>(i)(x))
return false; return false;
} }
return true; return true;
@ -79,8 +79,8 @@ static void setupParserRules()
}; };
search["ComplexQueryPart"] = [](const peg::SemanticValues &sv) -> Filter { search["ComplexQueryPart"] = [](const peg::SemanticValues &sv) -> Filter {
return [=](const CardData& x) { return [=](const CardData& x) {
for (int i = 0; i < static_cast<int>(sv.size()); ++i) { for (const auto & i : sv) {
if (std::any_cast<Filter>(sv[i])(x)) if (std::any_cast<Filter>(i)(x))
return true; return true;
} }
return false; return false;
@ -203,15 +203,15 @@ static void setupParserRules()
}; };
search["CompactStringSet"] = [](const peg::SemanticValues &sv) -> QStringList { search["CompactStringSet"] = [](const peg::SemanticValues &sv) -> QStringList {
QStringList result; QStringList result;
for (int i = 0; i < static_cast<int>(sv.size()); ++i) { for (const auto & i : sv) {
result.append(std::any_cast<QString>(sv[i])); result.append(std::any_cast<QString>(i));
} }
return result; return result;
}; };
search["StringList"] = [](const peg::SemanticValues &sv) -> QStringList { search["StringList"] = [](const peg::SemanticValues &sv) -> QStringList {
QStringList result; QStringList result;
for (int i = 0; i < static_cast<int>(sv.size()); ++i) { for (const auto & i : sv) {
result.append(std::any_cast<QString>(sv[i])); result.append(std::any_cast<QString>(i));
} }
return result; return result;
}; };
@ -265,13 +265,13 @@ static void setupParserRules()
search["ColorQuery"] = [](const peg::SemanticValues &sv) -> Filter { search["ColorQuery"] = [](const peg::SemanticValues &sv) -> Filter {
QString parts; QString parts;
for (int i = 0; i < static_cast<int>(sv.size()); ++i) { for (const auto & i : sv) {
parts += std::any_cast<char>(sv[i]); parts += std::any_cast<char>(i);
} }
bool idenity = sv.tokens[0][0] != 'i'; bool identity = sv.tokens[0][0] != 'i';
if (sv.tokens[1][0] == ':') { if (sv.tokens[1][0] == ':') {
return [=](const CardData& x) { return [=](const CardData& x) {
QString match = idenity ? x->getColors() : x->getProperty("coloridentity"); QString match = identity ? x->getColors() : x->getProperty("coloridentity");
if (parts.contains("m") && match.length() < 2) { if (parts.contains("m") && match.length() < 2) {
return false; return false;
} else if (parts == "m") { } else if (parts == "m") {
@ -289,7 +289,7 @@ static void setupParserRules()
}; };
} else { } else {
return [=](const CardData& x) { return [=](const CardData& x) {
QString match = idenity ? x->getColors() : x->getProperty("colorIdentity"); QString match = identity ? x->getColors() : x->getProperty("colorIdentity");
if (parts.contains("m") && match.length() < 2) if (parts.contains("m") && match.length() < 2)
return false; return false;
@ -329,11 +329,11 @@ static void setupParserRules()
QString field = std::any_cast<QString>(sv[0]); QString field = std::any_cast<QString>(sv[0]);
if (sv.choice() == 0) { if (sv.choice() == 0) {
StringMatcher matcher = std::any_cast<StringMatcher>(sv[1]); StringMatcher matcher = std::any_cast<StringMatcher>(sv[1]);
return [=](const CardData& x) -> bool { return x->hasProperty(field) ? matcher(x->getProperty(field)) : false; }; return [=](const CardData& x) -> bool { return x->hasProperty(field) && matcher(x->getProperty(field)); };
} else { } else {
NumberMatcher matcher = std::any_cast<NumberMatcher>(sv[1]); NumberMatcher matcher = std::any_cast<NumberMatcher>(sv[1]);
return [=](const CardData& x) -> bool { return [=](const CardData& x) -> bool {
return x->hasProperty(field) ? matcher(x->getProperty(field).toInt()) : false; return x->hasProperty(field) && matcher(x->getProperty(field).toInt());
}; };
} }
}; };

383
webclient/src/i18n-default.json
View file

File diff suppressed because one or more lines are too long