GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

validateWriteContext: Refactor to return the underlying reason for invalidity directly

Browse source
This commit is contained in:
Tomas Babej 2021-11-06 11:36:24 -04:00
parent f5dce013ce
commit 5d8f8dac35
No known key found for this signature in database
GPG key ID: B0747C6578F7D2F5
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/commands/CmdContext.cpp
View file

@ -117,41 +117,36 @@ std::string CmdContext::joinWords (const std::vector <std::string>& words, unsig
// invalid due to a wrong modifier use, the modifier string will contain the
// first invalid modifier.
//
bool CmdContext::validateWriteContext (const std::vector <A2>& lexedArgs, std::string& modifier_token)
bool CmdContext::validateWriteContext (const std::vector <A2>& lexedArgs, std::string& reason)
{
bool contains_or = false;
bool contains_modifier = false;
bool contains_tag_exclusion = false;
for (auto &arg: lexedArgs) {
if (arg._lextype == Lexer::Type::op)
if (arg.attribute ("raw") == "or")
{
contains_or = true;
break;
reason = "contains the 'OR' operator";
return false;
}
if (arg._lextype == Lexer::Type::pair) {
auto modifier = arg.attribute ("modifier");
if (modifier != "" && modifier != "is" && modifier != "equals")
{
contains_modifier = true;
modifier_token = arg.attribute ("raw");
break;
reason = format ("contains an attribute modifier '{1}'", arg.attribute ("raw"));
return false;
}
}
if (arg._lextype == Lexer::Type::tag) {
if (arg.attribute ("sign") == "-")
{
contains_tag_exclusion = true;
break;
reason = format ("contains tag exclusion '{1}'", arg.attribute ("raw"));
return false;
}
}
}
return not contains_or and not contains_modifier and not contains_tag_exclusion;
return true;
}
////////////////////////////////////////////////////////////////////////////////