gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CLI

Browse Source 
- Removed the 'ID/UUID or ID/UUID' processing from ::insertJunctions, as they
  are no longer needed, given ::insertIDExpr.
This commit is contained in:
Paul Beckingham
2014-10-25 18:25:24 -04:00
parent b4f72286ff
commit 08634a8bb5
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/CLI.cpp
View File

@@ -1330,13 +1330,6 @@ void CLI::findOperators ()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Two consecutive FILTER, ID or UUID arguments:
//
// ID ID --> ID or ID
// ID UUID --> ID or UUID
// UUID ID --> UUID or ID
// UUID UUID --> UUID or UUID
//
// Two consecutive FILTER, non-OP arguments that are not "(" or ")" need an // Two consecutive FILTER, non-OP arguments that are not "(" or ")" need an
// "and" operator inserted between them. // "and" operator inserted between them.
// //
@@ -1358,17 +1351,6 @@ void CLI::insertJunctions ()
if (prev == _args.begin ()) if (prev == _args.begin ())
prev = a; prev = a;
// Insert OR between consecutive FILTER ID/UUID args.
if (a != prev &&
(prev->hasTag ("ID") || prev->hasTag ("UUID")) &&
(a->hasTag ("ID") || a->hasTag ("UUID")))
{
A opOr ("argOp", "or");
opOr.tag ("FILTER");
opOr.tag ("OP");
reconstructed.push_back (opOr);
}
// Insert AND between terms. // Insert AND between terms.
else if (a != prev) else if (a != prev)
{ {