aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add pioneer (#3856)

Browse source
This commit is contained in:
ebbit1q 2019-11-03 04:48:17 +01:00 committed by Zach H
parent 7e89933552
commit b187fb52e0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/filter_string.cpp
View file

@ -28,7 +28,7 @@ ToughnessQuery <- [Tt] 'ou' 'ghness'? ws? NumericExpression
RarityQuery <- [rR] ':' RegexString RarityQuery <- [rR] ':' RegexString
FormatQuery <- 'f' ':' Format / Legality ':' Format FormatQuery <- 'f' ':' Format / Legality ':' Format
Format <- [Mm] 'odern'? / [Ss] 'tandard'? / [Vv] 'intage'? / [Ll] 'egacy'? / [Cc] 'ommander'? Format <- [Mm] 'odern'? / [Ss] 'tandard'? / [Vv] 'intage'? / [Ll] 'egacy'? / [Cc] 'ommander'? / [Pp] 'ioneer'?
Legality <- [Ll] 'egal'? / [Bb] 'anned'? / [Rr] 'estricted' Legality <- [Ll] 'egal'? / [Bb] 'anned'? / [Rr] 'estricted'
@ -68,7 +68,7 @@ static void setupParserRules()
search["Start"] = passthru; search["Start"] = passthru;
search["QueryPartList"] = [](const peg::SemanticValues &sv) -> Filter { search["QueryPartList"] = [](const peg::SemanticValues &sv) -> Filter {
return [=](CardData x) { return [=](CardData x) {
for (int i = 0; i < sv.size(); ++i) { for (int i = 0; i < static_cast<int>(sv.size()); ++i) {
if (!sv[i].get<Filter>()(x)) if (!sv[i].get<Filter>()(x))
return false; return false;
} }
@ -77,7 +77,7 @@ static void setupParserRules()
}; };
search["ComplexQueryPart"] = [](const peg::SemanticValues &sv) -> Filter { search["ComplexQueryPart"] = [](const peg::SemanticValues &sv) -> Filter {
return [=](CardData x) { return [=](CardData x) {
for (int i = 0; i < sv.size(); ++i) { for (int i = 0; i < static_cast<int>(sv.size()); ++i) {
if (sv[i].get<Filter>()(x)) if (sv[i].get<Filter>()(x))
return true; return true;
} }
@ -149,6 +149,8 @@ static void setupParserRules()
return "legacy"; return "legacy";
case 'c': case 'c':
return "commander"; return "commander";
case 'p':
return "pioneer";
default: default:
return ""; return "";
} }
@ -195,7 +197,7 @@ static void setupParserRules()
}; };
search["CompactStringSet"] = search["StringList"] = [](const peg::SemanticValues &sv) -> QStringList { search["CompactStringSet"] = search["StringList"] = [](const peg::SemanticValues &sv) -> QStringList {
QStringList result; QStringList result;
for (int i = 0; i < sv.size(); ++i) { for (int i = 0; i < static_cast<int>(sv.size()); ++i) {
result.append(sv[i].get<QString>()); result.append(sv[i].get<QString>());
} }
return result; return result;
@ -245,7 +247,7 @@ 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 < sv.size(); ++i) { for (int i = 0; i < static_cast<int>(sv.size()); ++i) {
parts += sv[i].get<char>(); parts += sv[i].get<char>();
} }
bool idenity = sv.tokens[0].first[0] != 'i'; bool idenity = sv.tokens[0].first[0] != 'i';