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

CLI

Browse Source 
- ::unsweetenAttributes no longer clobbers non-FILTER args.
This commit is contained in:
Paul Beckingham
2014-10-19 18:18:48 -04:00
parent f862ad15e6
commit 720cc57192
1 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/CLI.cpp
View File

@@ -550,78 +550,83 @@ void CLI::unsweetenAttributes ()
std::vector <A>::iterator a; std::vector <A>::iterator a;
for (a = _args.begin (); a != _args.end (); ++a) for (a = _args.begin (); a != _args.end (); ++a)
{ {
// Look for a valid attribute name. if (a->hasTag ("FILTER"))
bool found = false;
Nibbler n (a->attribute ("raw"));
std::string name;
if (n.getName (name) &&
name.length ())
{ {
if (n.skip (':')) // Look for a valid attribute name.
bool found = false;
Nibbler n (a->attribute ("raw"));
std::string name;
if (n.getName (name) &&
name.length ())
{ {
std::string value; if (n.skip (':'))
if (n.getQuoted ('"', value) ||
n.getQuoted ('\'', value) ||
n.getUntilEOS (value) ||
n.depleted ())
{ {
if (value == "") std::string value;
value = "''"; if (n.getQuoted ('"', value) ||
n.getQuoted ('\'', value) ||
std::string canonical; n.getUntilEOS (value) ||
if (canonicalize (canonical, "uda", name)) n.depleted ())
{ {
A left ("argUDA", name); if (value == "")
left.attribute ("name", canonical); value = "''";
left.tag ("UDA");
left.tag ("MODIFIABLE");
left.tag ("FILTER");
reconstructed.push_back (left);
found = true;
}
else if (canonicalize (canonical, "pseudo", name)) std::string canonical;
{ if (canonicalize (canonical, "uda", name))
A left ("argUDA", name);
left.attribute ("name", canonical);
left.tag ("PSEUDO");
left.tag ("FILTER");
reconstructed.push_back (left);
found = true;
}
else if (canonicalize (canonical, "attribute", name))
{
A lhs ("argAtt", name);
lhs.attribute ("name", canonical);
lhs.tag ("ATTRIBUTE");
lhs.tag ("FILTER");
std::map <std::string, Column*>::const_iterator col;
col = context.columns.find (canonical);
if (col != context.columns.end () &&
col->second->modifiable ())
{ {
lhs.tag ("MODIFIABLE"); A left ("argUDA", name);
left.attribute ("name", canonical);
left.tag ("UDA");
left.tag ("MODIFIABLE");
left.tag ("FILTER");
reconstructed.push_back (left);
found = true;
} }
A op ("argAtt", "="); else if (canonicalize (canonical, "pseudo", name))
op.tag ("OP"); {
op.tag ("FILTER"); A left ("argUDA", name);
left.attribute ("name", canonical);
left.tag ("PSEUDO");
left.tag ("FILTER");
reconstructed.push_back (left);
found = true;
}
A rhs ("argAtt", value); else if (canonicalize (canonical, "attribute", name))
rhs.tag ("FILTER"); {
A lhs ("argAtt", name);
lhs.attribute ("name", canonical);
lhs.tag ("ATTRIBUTE");
lhs.tag ("FILTER");
reconstructed.push_back (lhs); std::map <std::string, Column*>::const_iterator col;
reconstructed.push_back (op); col = context.columns.find (canonical);
reconstructed.push_back (rhs); if (col != context.columns.end () &&
found = true; col->second->modifiable ())
{
lhs.tag ("MODIFIABLE");
}
A op ("argAtt", "=");
op.tag ("OP");
op.tag ("FILTER");
A rhs ("argAtt", value);
rhs.tag ("FILTER");
reconstructed.push_back (lhs);
reconstructed.push_back (op);
reconstructed.push_back (rhs);
found = true;
}
} }
} }
} }
}
if (!found) if (!found)
reconstructed.push_back (*a);
}
else
reconstructed.push_back (*a); reconstructed.push_back (*a);
} }