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

E9 - Relational Operators

Browse Source 
- Added missing-data handling for the relational operators <, <=, >
  and >=.
This commit is contained in:
Paul Beckingham
2011-08-21 16:54:50 -04:00
parent f11c8ee5c6
commit e0ecb7a2d8
1 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/E9.cpp
View File

@@ -290,12 +290,18 @@ void E9::operator_lt (Arg& result, Arg& left, Arg& right)
else if (left._type == Arg::type_date || else if (left._type == Arg::type_date ||
right._type == Arg::type_date) right._type == Arg::type_date)
{ {
Date left_date (left._value, _dateformat); if (left._value == "" ||
Date right_date (right._value, _dateformat); right._value == "")
result._value = "false";
else
{
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._value = (left_date < right_date) result._value = (left_date < right_date)
? "true" ? "true"
: "false"; : "false";
}
} }
else else
{ {
@@ -323,12 +329,18 @@ void E9::operator_lte (Arg& result, Arg& left, Arg& right)
else if (left._type == Arg::type_date || else if (left._type == Arg::type_date ||
right._type == Arg::type_date) right._type == Arg::type_date)
{ {
Date left_date (left._value, _dateformat); if (left._value == "" ||
Date right_date (right._value, _dateformat); right._value == "")
result._value = "false";
else
{
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._value = (left_date <= right_date) result._value = (left_date <= right_date)
? "true" ? "true"
: "false"; : "false";
}
} }
else else
{ {
@@ -356,12 +368,18 @@ void E9::operator_gte (Arg& result, Arg& left, Arg& right)
else if (left._type == Arg::type_date || else if (left._type == Arg::type_date ||
right._type == Arg::type_date) right._type == Arg::type_date)
{ {
Date left_date (left._value, _dateformat); if (left._value == "" ||
Date right_date (right._value, _dateformat); right._value == "")
result._value = "false";
else
{
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._value = (left_date >= right_date) result._value = (left_date >= right_date)
? "true" ? "true"
: "false"; : "false";
}
} }
else else
{ {
@@ -388,12 +406,18 @@ void E9::operator_gt (Arg& result, Arg& left, Arg& right)
else if (left._type == Arg::type_date || else if (left._type == Arg::type_date ||
right._type == Arg::type_date) right._type == Arg::type_date)
{ {
Date left_date (left._value, _dateformat); if (left._value == "" ||
Date right_date (right._value, _dateformat); right._value == "")
result._value = "false";
else
{
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._value = result._value = (left_date > right_date) result._value = result._value = (left_date > right_date)
? "true" ? "true"
: "false"; : "false";
}
} }
else else
{ {