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

TW-1434

Browse source 
- TW-1434 Parser issue in description.contains (thanks to Ralph Bean).
This commit is contained in:
Paul Beckingham 2014-11-09 18:44:12 -05:00
parent 4bbb6fea99
commit d38e606a50
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -171,6 +171,7 @@
- TW-1424 Using a date of '1824days' (in the future) fails (thanks to Black Ops - TW-1424 Using a date of '1824days' (in the future) fails (thanks to Black Ops
Testing). Testing).
- TW-1428 Add support for color.uda.<name>.<value> rules. - TW-1428 Add support for color.uda.<name>.<value> rules.
- TW-1434 Parser issue in description.contains (thanks to Ralph Bean).
- TW-1436 Parser hangs when multiple slashes are used. - TW-1436 Parser hangs when multiple slashes are used.
- TW-1437 taskd.trust has a bad default value. - TW-1437 taskd.trust has a bad default value.
- TW-1441 task import continues happily if filename doesn't exist. - TW-1441 task import continues happily if filename doesn't exist.

17
src/CLI.cpp
View file

@ -1128,6 +1128,7 @@ void CLI::desugarFilterAttributeModifiers ()
A op ("argAttmod", ""); A op ("argAttmod", "");
op.tag ("FILTER"); op.tag ("FILTER");
op.tag ("OP");
A rhs ("argAttMod", ""); A rhs ("argAttMod", "");
rhs.tag ("FILTER"); rhs.tag ("FILTER");
@ -1135,77 +1136,66 @@ void CLI::desugarFilterAttributeModifiers ()
if (modifier == "before" || modifier == "under" || modifier == "below") if (modifier == "before" || modifier == "under" || modifier == "below")
{ {
op.attribute ("raw", "<"); op.attribute ("raw", "<");
op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "after" || modifier == "over" || modifier == "above") else if (modifier == "after" || modifier == "over" || modifier == "above")
{ {
op.attribute ("raw", ">"); op.attribute ("raw", ">");
op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "none") else if (modifier == "none")
{ {
op.attribute ("raw", "=="); op.attribute ("raw", "==");
op.tag ("OP");
rhs.attribute ("raw", "''"); rhs.attribute ("raw", "''");
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "any") else if (modifier == "any")
{ {
op.attribute ("raw", "!="); op.attribute ("raw", "!=");
op.tag ("OP");
rhs.attribute ("raw", "''"); rhs.attribute ("raw", "''");
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "is" || modifier == "equals") else if (modifier == "is" || modifier == "equals")
{ {
op.attribute ("raw", "=="); op.attribute ("raw", "==");
op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "isnt" || modifier == "not") else if (modifier == "isnt" || modifier == "not")
{ {
op.attribute ("raw", "!="); op.attribute ("raw", "!=");
op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "has" || modifier == "contains") else if (modifier == "has" || modifier == "contains")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP"); rhs.attribute ("raw", "'" + value + "'");
rhs.attribute ("raw", value);
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "hasnt") else if (modifier == "hasnt")
{ {
op.attribute ("raw", "!~"); op.attribute ("raw", "!~");
op.tag ("OP"); rhs.attribute ("raw", "'" + value + "'");
rhs.attribute ("raw", value);
rhs.tag ("LITERAL"); rhs.tag ("LITERAL");
} }
else if (modifier == "startswith" || modifier == "left") else if (modifier == "startswith" || modifier == "left")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP");
rhs.attribute ("raw", "'^" + value + "'"); rhs.attribute ("raw", "'^" + value + "'");
rhs.tag ("REGEX"); rhs.tag ("REGEX");
} }
else if (modifier == "endswith" || modifier == "right") else if (modifier == "endswith" || modifier == "right")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP");
rhs.attribute ("raw", "'" + value + "$'"); rhs.attribute ("raw", "'" + value + "$'");
rhs.tag ("REGEX"); rhs.tag ("REGEX");
} }
else if (modifier == "word") else if (modifier == "word")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP");
#if defined (DARWIN) #if defined (DARWIN)
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
#elif defined (SOLARIS) #elif defined (SOLARIS)
@ -1218,7 +1208,6 @@ void CLI::desugarFilterAttributeModifiers ()
else if (modifier == "noword") else if (modifier == "noword")
{ {
op.attribute ("raw", "!~"); op.attribute ("raw", "!~");
op.tag ("OP");
#if defined (DARWIN) #if defined (DARWIN)
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
#elif defined (SOLARIS) #elif defined (SOLARIS)