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

Expressions

Browse Source 
- Implemented type-specific <, <=, >, <= for "priority".  Untested.
This commit is contained in:
Paul Beckingham
2011-06-28 00:35:15 -04:00
parent 2c621eaadc
commit 3096364352
1 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/Expression.cpp
View File

@@ -183,22 +183,46 @@ bool Expression::eval (Task& task)
else if (arg->first == "<=") else if (arg->first == "<=")
{ {
// std::cout << "# " << left.dump () << " <= " << right.dump () << "\n"; // std::cout << "# " << left.dump () << " <= " << right.dump () << "\n";
bool result = (left <= right); bool result = false;
if (left._raw == "priority")
{
left.cast (Variant::v_string);
right.cast (Variant::v_string);
if (left._string == right._string ) result = true;
else if ( right._string == "H") result = true;
else if (left._string == "L" && right._string == "M") result = true;
else if (left._string == "" ) result = true;
}
else
result = (left <= right);
left = Variant (result); left = Variant (result);
left._raw_type = "bool"; left._raw_type = "bool";
// std::cout << "# --> " << left.dump () << "\n";
value_stack.push_back (left); value_stack.push_back (left);
} }
else if (arg->first == ">=") else if (arg->first == ">=")
{ {
// std::cout << "# " << left.dump () << " >= " << right.dump () << "\n"; // std::cout << "# " << left.dump () << " >= " << right.dump () << "\n";
bool result = (left >= right); bool result = false;
if (left._raw == "priority")
{
left.cast (Variant::v_string);
right.cast (Variant::v_string);
if (left._string == right._string ) result = true;
else if (left._string == "H" ) result = true;
else if (left._string == "M" && right._string == "L") result = true;
else if ( right._string == "" ) result = true;
}
else
result = (left >= right);
left = Variant (result); left = Variant (result);
left._raw_type = "bool"; left._raw_type = "bool";
// std::cout << "# --> " << left.dump () << "\n";
value_stack.push_back (left); value_stack.push_back (left);
} }
@@ -260,11 +284,22 @@ bool Expression::eval (Task& task)
else if (arg->first == ">") else if (arg->first == ">")
{ {
// std::cout << "# " << left.dump () << " > " << right.dump () << "\n"; // std::cout << "# " << left.dump () << " > " << right.dump () << "\n";
bool result = (left > right); bool result = false;
if (left._raw == "priority")
{
left.cast (Variant::v_string);
right.cast (Variant::v_string);
if (left._string == "H" && right._string != "H") result = true;
else if (left._string == "M" && right._string == "L") result = true;
else if (left._string != "" && right._string == "") result = true;
}
else
result = (left > right);
left = Variant (result); left = Variant (result);
left._raw_type = "bool"; left._raw_type = "bool";
// std::cout << "# --> " << left.dump () << "\n";
value_stack.push_back (left); value_stack.push_back (left);
} }
@@ -321,11 +356,22 @@ bool Expression::eval (Task& task)
else if (arg->first == "<") else if (arg->first == "<")
{ {
// std::cout << "# " << left.dump () << " < " << right.dump () << "\n"; // std::cout << "# " << left.dump () << " < " << right.dump () << "\n";
bool result = (left < right); bool result = false;
if (left._raw == "priority")
{
left.cast (Variant::v_string);
right.cast (Variant::v_string);
if (left._string != "H" && right._string == "H") result = true;
else if (left._string == "L" && right._string == "M") result = true;
else if (left._string == "" && right._string != "") result = true;
}
else
result = (left < right);
left = Variant (result); left = Variant (result);
left._raw_type = "bool"; left._raw_type = "bool";
// std::cout << "# --> " << left.dump () << "\n";
value_stack.push_back (left); value_stack.push_back (left);
} }