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

Code Cleanup

Browse source 
- Found a redundant operator symbol indicator and removed it.
This commit is contained in:
Paul Beckingham 2013-11-22 21:12:36 -05:00
parent 97ef13a1b1
commit 174066c1d6
1 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/A3.cpp
View file

@ -25,6 +25,7 @@
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <iostream> // TODO Remove
#include <cmake.h> #include <cmake.h>
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
@ -72,38 +73,37 @@ static struct
std::string op; std::string op;
int precedence; int precedence;
char type; char type;
int symbol;
char associativity; char associativity;
} operators[] = } operators[] =
{ {
// Operator Precedence Type Symbol Associativity // Operator Precedence Type Associativity
{ "and", 5, 'b', 0, 'l' }, // Conjunction { "and", 5, 'b', 'l' }, // Conjunction
{ "xor", 4, 'b', 0, 'l' }, // Disjunction { "xor", 4, 'b', 'l' }, // Disjunction
{ "or", 3, 'b', 0, 'l' }, // Disjunction { "or", 3, 'b', 'l' }, // Disjunction
{ "<=", 10, 'b', 1, 'l' }, // Less than or equal { "<=", 10, 'b', 'l' }, // Less than or equal
{ ">=", 10, 'b', 1, 'l' }, // Greater than or equal { ">=", 10, 'b', 'l' }, // Greater than or equal
{ "!~", 9, 'b', 1, 'l' }, // Regex non-match { "!~", 9, 'b', 'l' }, // Regex non-match
{ "!=", 9, 'b', 1, 'l' }, // Inequal { "!=", 9, 'b', 'l' }, // Inequal
{ "=", 9, 'b', 1, 'l' }, // Equal { "=", 9, 'b', 'l' }, // Equal
// { "^", 16, 'b', 1, 'r' }, // Exponent // { "^", 16, 'b', 'r' }, // Exponent
{ ">", 10, 'b', 1, 'l' }, // Greater than { ">", 10, 'b', 'l' }, // Greater than
{ "~", 9, 'b', 1, 'l' }, // Regex match { "~", 9, 'b', 'l' }, // Regex match
{ "!", 15, 'u', 1, 'r' }, // Not { "!", 15, 'u', 'r' }, // Not
{ "_hastag_", 9, 'b', 0, 'l'}, // +tag [Pseudo-op] { "_hastag_", 9, 'b', 'l'}, // +tag [Pseudo-op]
{ "_notag_", 9, 'b', 0, 'l'}, // -tag [Pseudo-op] { "_notag_", 9, 'b', 'l'}, // -tag [Pseudo-op]
{ "-", 15, 'u', 1, 'r' }, // Unary minus { "-", 15, 'u', 'r' }, // Unary minus
{ "*", 13, 'b', 1, 'l' }, // Multiplication { "*", 13, 'b', 'l' }, // Multiplication
{ "/", 13, 'b', 1, 'l' }, // Division { "/", 13, 'b', 'l' }, // Division
// { "%", 13, 'b', 1, 'l' }, // Modulus // { "%", 13, 'b', 'l' }, // Modulus
{ "+", 12, 'b', 1, 'l' }, // Addition { "+", 12, 'b', 'l' }, // Addition
{ "-", 12, 'b', 1, 'l' }, // Subtraction { "-", 12, 'b', 'l' }, // Subtraction
{ "<", 10, 'b', 1, 'l' }, // Less than { "<", 10, 'b', 'l' }, // Less than
{ "(", 0, 'b', 1, 'l' }, // Precedence start { "(", 0, 'b', 'l' }, // Precedence start
{ ")", 0, 'b', 1, 'l' }, // Precedence end { ")", 0, 'b', 'l' }, // Precedence end
}; };
#define NUM_MODIFIER_NAMES (sizeof (modifierNames) / sizeof (modifierNames[0])) #define NUM_MODIFIER_NAMES (sizeof (modifierNames) / sizeof (modifierNames[0]))
@ -1106,7 +1106,10 @@ const A3 A3::expand (const A3& input) const
// Default --> preserve // Default --> preserve
else else
{
std::cout << "# default: " << arg->_raw << "\n";
expanded.push_back (*arg); expanded.push_back (*arg);
}
previous = arg; previous = arg;
} }