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

Entities: There is no spoon^H^H^H^H^Huda entity

Browse source 
- The code was trying to canonicalize 'attribute' and 'uda' separately,
  but there are no 'uda' entities.
This commit is contained in:
Paul Beckingham 2015-07-15 19:40:13 -04:00
parent 264dae02bc
commit b92802c2fb
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/CLI2.cpp
View file

@ -923,8 +923,7 @@ void CLI2::canonicalizeNames ()
std::string name = a.attribute ("name"); std::string name = a.attribute ("name");
std::string canonical; std::string canonical;
if (canonicalize (canonical, "pseudo", name) || if (canonicalize (canonical, "pseudo", name) ||
canonicalize (canonical, "attribute", name) || canonicalize (canonical, "attribute", name))
canonicalize (canonical, "uda", name))
{ {
a.attribute ("canonical", canonical); a.attribute ("canonical", canonical);
} }
@ -1116,8 +1115,7 @@ void CLI2::desugarFilterAttributes ()
reconstructed.push_back (lhs); reconstructed.push_back (lhs);
found = true; found = true;
} }
else if (canonicalize (canonical, "attribute", name) || else if (canonicalize (canonical, "attribute", name))
canonicalize (canonical, "uda", name))
{ {
// Certain attribute types do not suport math. // Certain attribute types do not suport math.
// string --> no // string --> no

3
src/commands/CmdUnique.cpp
View file

@ -73,8 +73,7 @@ int CmdUnique::execute (std::string& output)
throw std::string (STRING_CMD_UNIQUE_MISSING); throw std::string (STRING_CMD_UNIQUE_MISSING);
std::string canonical; std::string canonical;
if (! context.cli2.canonicalize (canonical, "attribute", attribute) && if (! context.cli2.canonicalize (canonical, "attribute", attribute))
! context.cli2.canonicalize (canonical, "uda", attribute))
throw std::string (STRING_CMD_UNIQUE_VALID); throw std::string (STRING_CMD_UNIQUE_VALID);
// Find number of matching tasks. // Find number of matching tasks.