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

CLI2: ::desugarFilterPlainArgs now needs to look for Lexer::Type::identifier

Browse Source
This commit is contained in:
Paul Beckingham
2015-07-27 02:18:36 -04:00
parent cd1bd1eec9
commit 9c8edc4121
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/CLI2.cpp
View File

@@ -1627,23 +1627,23 @@ void CLI2::desugarFilterPlainArgs ()
auto praw = prev->attribute ("raw");
auto ppraw = prevprev->attribute ("raw");
if ((prevprev->_lextype != Lexer::Type::op || // argX
ppraw == "(" ||
ppraw == ")" ||
ppraw == "and" ||
ppraw == "or" ||
ppraw == "xor") &&
if ((prevprev->_lextype != Lexer::Type::op || // argX
ppraw == "(" ||
ppraw == ")" ||
ppraw == "and" ||
ppraw == "or" ||
ppraw == "xor") &&
(prev->_lextype == Lexer::Type::dom || // candidate
prev->_lextype == Lexer::Type::word) && // candidate
(prev->_lextype == Lexer::Type::identifier || // candidate
prev->_lextype == Lexer::Type::word) && // candidate
prev->hasTag ("FILTER") && // candidate
prev->hasTag ("FILTER") && // candidate
(a._lextype != Lexer::Type::op || // argY
raw == "(" ||
raw == ")" ||
raw == "and" ||
raw == "or" ||
(a._lextype != Lexer::Type::op || // argY
raw == "(" ||
raw == ")" ||
raw == "and" ||
raw == "or" ||
raw == "xor"))
{
prev->tag ("PLAIN");