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

CLI2: Removed unnecessary tagging, given Lexer::Type

Browse source
This commit is contained in:
Paul Beckingham 2015-06-20 10:54:20 -07:00
parent c44b155e97
commit 040f990bd1
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/CLI2.cpp
View file

@ -1418,23 +1418,21 @@ void CLI2::insertIDExpr ()
// ) // )
// Building block operators. // Building block operators.
A2 openParen ("(", Lexer::Type::op); openParen.tag ("FILTER"); openParen.tag ("OP"); A2 openParen ("(", Lexer::Type::op); openParen.tag ("FILTER");
A2 closeParen (")", Lexer::Type::op); closeParen.tag ("FILTER"); closeParen.tag ("OP"); A2 closeParen (")", Lexer::Type::op); closeParen.tag ("FILTER");
A2 opOr ("or", Lexer::Type::op); opOr.tag ("FILTER"); opOr.tag ("OP"); A2 opOr ("or", Lexer::Type::op); opOr.tag ("FILTER");
A2 opAnd ("and", Lexer::Type::op); opAnd.tag ("FILTER"); opAnd.tag ("OP"); A2 opAnd ("and", Lexer::Type::op); opAnd.tag ("FILTER");
A2 opSimilar ("=", Lexer::Type::op); opSimilar.tag ("FILTER"); opSimilar.tag ("OP"); A2 opSimilar ("=", Lexer::Type::op); opSimilar.tag ("FILTER");
A2 opEqual ("==", Lexer::Type::op); opEqual.tag ("FILTER"); opEqual.tag ("OP"); A2 opEqual ("==", Lexer::Type::op); opEqual.tag ("FILTER");
A2 opGTE (">=", Lexer::Type::op); opGTE.tag ("FILTER"); opGTE.tag ("OP"); A2 opGTE (">=", Lexer::Type::op); opGTE.tag ("FILTER");
A2 opLTE ("<=", Lexer::Type::op); opLTE.tag ("FILTER"); opLTE.tag ("OP"); A2 opLTE ("<=", Lexer::Type::op); opLTE.tag ("FILTER");
// Building block attributes. // Building block attributes.
A2 argID ("id", Lexer::Type::dom); A2 argID ("id", Lexer::Type::dom);
argID.tag ("FILTER"); argID.tag ("FILTER");
argID.tag ("ATTRIBUTE");
A2 argUUID ("uuid", Lexer::Type::uuid); A2 argUUID ("uuid", Lexer::Type::uuid);
argUUID.tag ("FILTER"); argUUID.tag ("FILTER");
argUUID.tag ("ATTRIBUTE");
reconstructed.push_back (openParen); reconstructed.push_back (openParen);
@ -1452,8 +1450,6 @@ void CLI2::insertIDExpr ()
A2 value (r->first, Lexer::Type::number); A2 value (r->first, Lexer::Type::number);
value.tag ("FILTER"); value.tag ("FILTER");
value.tag ("LITERAL");
value.tag ("NUMBER");
reconstructed.push_back (value); reconstructed.push_back (value);
reconstructed.push_back (closeParen); reconstructed.push_back (closeParen);
@ -1466,8 +1462,6 @@ void CLI2::insertIDExpr ()
A2 startValue (r->first, Lexer::Type::number); A2 startValue (r->first, Lexer::Type::number);
startValue.tag ("FILTER"); startValue.tag ("FILTER");
startValue.tag ("LITERAL");
startValue.tag ("NUMBER");
reconstructed.push_back (startValue); reconstructed.push_back (startValue);
reconstructed.push_back (opAnd); reconstructed.push_back (opAnd);
@ -1476,8 +1470,6 @@ void CLI2::insertIDExpr ()
A2 endValue (r->second, Lexer::Type::number); A2 endValue (r->second, Lexer::Type::number);
endValue.tag ("FILTER"); endValue.tag ("FILTER");
endValue.tag ("LITERAL");
endValue.tag ("NUMBER");
reconstructed.push_back (endValue); reconstructed.push_back (endValue);
reconstructed.push_back (closeParen); reconstructed.push_back (closeParen);
@ -1501,8 +1493,6 @@ void CLI2::insertIDExpr ()
A2 value ("'" + *u + "'", Lexer::Type::string); A2 value ("'" + *u + "'", Lexer::Type::string);
value.tag ("FILTER"); value.tag ("FILTER");
value.tag ("LITERAL");
value.tag ("STRING");
reconstructed.push_back (value); reconstructed.push_back (value);
reconstructed.push_back (closeParen); reconstructed.push_back (closeParen);