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

CLI2: Expand DOM references in single-token values

Browse Source
This commit is contained in:
Paul Beckingham
2015-09-07 11:49:55 -04:00
parent 557a8d357c
commit e4132f6a02
4 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/CLI2.cpp
View File

@@ -1141,7 +1141,7 @@ void CLI2::findStrayModifications ()
}
////////////////////////////////////////////////////////////////////////////////
// <name>[.<mod>]:['"][<value>]['"] --> name = value
// <name>[.<mod>]:['"][<value>]['"] --> name <op> value
void CLI2::desugarFilterAttributes ()
{
bool changes = false;
@@ -1157,6 +1157,8 @@ void CLI2::desugarFilterAttributes ()
std::string sep = a.attribute ("separator");
std::string value = a.attribute ("value");
// An unquoted string, while equivalent to an empty string, doesn't cause
// an operand shortage in eval.
if (value == "")
value = "''";
@@ -1304,8 +1306,14 @@ void CLI2::desugarFilterAttributes ()
reconstructed.push_back (lhs);
reconstructed.push_back (op);
// Do not modify this construct without full understanding.
if (values.size () == 1 || ! evalSupported)
{
if (Lexer::isDOM (rhs.attribute ("raw")))
rhs._lextype = Lexer::Type::dom;
reconstructed.push_back (rhs);
}
else
for (auto& v : values)
reconstructed.push_back (v);