GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-30 02:17:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CLI

Browse source 
- Removed MODIFIABLE tags for FILTER args - pointless.
- Added LITERAL and REGEX tags for ATTMOD values.
This commit is contained in:
Paul Beckingham 2014-10-25 13:43:39 -04:00
parent 22d3852bfd
commit d0ae05ba1c
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/CLI.cpp
View file

@ -795,18 +795,9 @@ void CLI::desugarAttributeModifiers ()
lhs.tag ("FILTER"); lhs.tag ("FILTER");
lhs.attribute ("name", canonical); lhs.attribute ("name", canonical);
lhs.attribute ("raw", value);
lhs.attribute ("modifier", modifier); lhs.attribute ("modifier", modifier);
lhs.attribute ("sense", sense); lhs.attribute ("sense", sense);
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 op ("argAttmod", ""); A op ("argAttmod", "");
op.tag ("FILTER"); op.tag ("FILTER");
@ -818,60 +809,70 @@ void CLI::desugarAttributeModifiers ()
op.attribute ("raw", "<"); op.attribute ("raw", "<");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
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"); op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL");
} }
else if (modifier == "none") else if (modifier == "none")
{ {
op.attribute ("raw", "=="); op.attribute ("raw", "==");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", "''"); rhs.attribute ("raw", "''");
rhs.tag ("LITERAL");
} }
else if (modifier == "any") else if (modifier == "any")
{ {
op.attribute ("raw", "!="); op.attribute ("raw", "!=");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", "''"); rhs.attribute ("raw", "''");
rhs.tag ("LITERAL");
} }
else if (modifier == "is" || modifier == "equals") else if (modifier == "is" || modifier == "equals")
{ {
op.attribute ("raw", "=="); op.attribute ("raw", "==");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL");
} }
else if (modifier == "isnt" || modifier == "not") else if (modifier == "isnt" || modifier == "not")
{ {
op.attribute ("raw", "!="); op.attribute ("raw", "!=");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL");
} }
else if (modifier == "has" || modifier == "contains") else if (modifier == "has" || modifier == "contains")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL");
} }
else if (modifier == "hasnt") else if (modifier == "hasnt")
{ {
op.attribute ("raw", "!~"); op.attribute ("raw", "!~");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", value); rhs.attribute ("raw", value);
rhs.tag ("LITERAL");
} }
else if (modifier == "startswith" || modifier == "left") else if (modifier == "startswith" || modifier == "left")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", "'^" + value + "'"); rhs.attribute ("raw", "'^" + value + "'");
rhs.tag ("REGEX");
} }
else if (modifier == "endswith" || modifier == "right") else if (modifier == "endswith" || modifier == "right")
{ {
op.attribute ("raw", "~"); op.attribute ("raw", "~");
op.tag ("OP"); op.tag ("OP");
rhs.attribute ("raw", "'" + value + "$'"); rhs.attribute ("raw", "'" + value + "$'");
rhs.tag ("REGEX");
} }
else if (modifier == "word") else if (modifier == "word")
{ {
@ -884,6 +885,7 @@ void CLI::desugarAttributeModifiers ()
#else #else
rhs.attribute ("raw", "'\\b" + value + "\\b'"); rhs.attribute ("raw", "'\\b" + value + "\\b'");
#endif #endif
rhs.tag ("REGEX");
} }
else if (modifier == "noword") else if (modifier == "noword")
{ {
@ -896,6 +898,7 @@ void CLI::desugarAttributeModifiers ()
#else #else
rhs.attribute ("raw", "'\\b" + value + "\\b'"); rhs.attribute ("raw", "'\\b" + value + "\\b'");
#endif #endif
rhs.tag ("REGEX");
} }
else else
throw format (STRING_PARSER_UNKNOWN_ATTMOD, modifier); throw format (STRING_PARSER_UNKNOWN_ATTMOD, modifier);