mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
CLI
- Implemented ::disqualifySugarFree to prevent lexing arguments that ultimately resolve to zero operators.
This commit is contained in:
parent
125b5464dc
commit
61e943f456
2 changed files with 32 additions and 5 deletions
36
src/CLI.cpp
36
src/CLI.cpp
|
@ -666,8 +666,9 @@ void CLI::addArg (const std::string& arg)
|
|||
|
||||
if (disqualifyInsufficientTerms (lexemes) ||
|
||||
disqualifyNoOps (lexemes) ||
|
||||
disqualifyOnlyParenOps (lexemes) ||
|
||||
disqualifyFirstLastBinary (lexemes))
|
||||
// disqualifyOnlyParenOps (lexemes) ||
|
||||
disqualifyFirstLastBinary (lexemes) ||
|
||||
disqualifySugarFree (lexemes))
|
||||
{
|
||||
_original_args.push_back (raw);
|
||||
}
|
||||
|
@ -2373,18 +2374,43 @@ bool CLI::disqualifyOnlyParenOps (
|
|||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Disqualify terms when there are are binary operators at either end, as long
|
||||
// as there are no operators in between, which includes syntactic sugar that
|
||||
// hides operators.
|
||||
bool CLI::disqualifyFirstLastBinary (
|
||||
const std::vector <std::pair <std::string, Lexer::Type> >& lexemes) const
|
||||
{
|
||||
bool firstBinary = false;
|
||||
bool lastBinary = false;
|
||||
|
||||
std::string dummy;
|
||||
if (canonicalize (dummy, "binary_operator", lexemes[0].first))
|
||||
return true;
|
||||
firstBinary = true;
|
||||
|
||||
if (lexemes.size () > 1 &&
|
||||
canonicalize (dummy, "binary_operator", lexemes[lexemes.size () - 1].first))
|
||||
return true;
|
||||
lastBinary = true;
|
||||
|
||||
return false;
|
||||
return firstBinary || lastBinary;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Disqualify terms when there operators hidden by syntactic sugar.
|
||||
bool CLI::disqualifySugarFree (
|
||||
const std::vector <std::pair <std::string, Lexer::Type> >& lexemes) const
|
||||
{
|
||||
bool sugared = true;
|
||||
for (unsigned int i = 1; i < lexemes.size () - 1; ++i)
|
||||
if (isTag (lexemes[i].first) ||
|
||||
isUUIDList (lexemes[i].first) ||
|
||||
isUUID (lexemes[i].first) ||
|
||||
isIDSequence (lexemes[i].first) ||
|
||||
isID (lexemes[i].first) ||
|
||||
isPattern (lexemes[i].first) ||
|
||||
isAttribute (lexemes[i].first))
|
||||
sugared = true;
|
||||
|
||||
return ! sugared;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -130,6 +130,7 @@ private:
|
|||
bool disqualifyNoOps (const std::vector <std::pair <std::string, Lexer::Type> >&) const;
|
||||
bool disqualifyOnlyParenOps (const std::vector <std::pair <std::string, Lexer::Type> >&) const;
|
||||
bool disqualifyFirstLastBinary (const std::vector <std::pair <std::string, Lexer::Type> >&) const;
|
||||
bool disqualifySugarFree (const std::vector <std::pair <std::string, Lexer::Type> >&) const;
|
||||
|
||||
public:
|
||||
std::multimap <std::string, std::string> _entities;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue