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

Expressions - Refactor

Browse Source 
- The A3::Arg object is very similar to the E9::Term object, so the two are
  being merged.  First step is to separate A3::Arg into it's own space, then
  add a _type member.
- Added more valid stop characters as terminators for various arg types.
- Removed redundant E9 special handling for dates, which is already built in
  to the Date object.
This commit is contained in:
Paul Beckingham
2011-08-19 22:42:19 -04:00
parent 7dd3e081c7
commit 816b07e868
6 changed files with 190 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/E9.cpp
View File

@@ -301,17 +301,8 @@ void E9::operator_lt (Term& result, Term& left, Term& right)
else if (left._category == "date" ||
right._category == "date")
{
Date left_date;
if (digitsOnly (left._value))
left_date = Date (left._value);
else
left_date = Date (left._value, _dateformat);
Date right_date;
if (digitsOnly (right._value))
right_date = Date (right._value);
else
right_date = Date (right._value, _dateformat);
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._raw = result._value = (left_date < right_date)
? "true"
@@ -343,17 +334,8 @@ void E9::operator_lte (Term& result, Term& left, Term& right)
else if (left._category == "date" ||
right._category == "date")
{
Date left_date;
if (digitsOnly (left._value))
left_date = Date (left._value);
else
left_date = Date (left._value, _dateformat);
Date right_date;
if (digitsOnly (right._value))
right_date = Date (right._value);
else
right_date = Date (right._value, _dateformat);
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._raw = result._value = (left_date <= right_date)
? "true"
@@ -385,17 +367,8 @@ void E9::operator_gte (Term& result, Term& left, Term& right)
else if (left._category == "date" ||
right._category == "date")
{
Date left_date;
if (digitsOnly (left._value))
left_date = Date (left._value);
else
left_date = Date (left._value, _dateformat);
Date right_date;
if (digitsOnly (right._value))
right_date = Date (right._value);
else
right_date = Date (right._value, _dateformat);
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._raw = result._value = (left_date >= right_date)
? "true"
@@ -426,17 +399,8 @@ void E9::operator_gt (Term& result, Term& left, Term& right)
else if (left._category == "date" ||
right._category == "date")
{
Date left_date;
if (digitsOnly (left._value))
left_date = Date (left._value);
else
left_date = Date (left._value, _dateformat);
Date right_date;
if (digitsOnly (right._value))
right_date = Date (right._value);
else
right_date = Date (right._value, _dateformat);
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._raw = result._value = (left_date > right_date)
? "true"
@@ -507,17 +471,8 @@ void E9::operator_equal (
else if (left._category == "date" ||
right._category == "date")
{
Date left_date;
if (digitsOnly (left._value))
left_date = Date (left._value);
else
left_date = Date (left._value, _dateformat);
Date right_date;
if (digitsOnly (right._value))
right_date = Date (right._value);
else
right_date = Date (right._value, _dateformat);
Date left_date (left._value, _dateformat);
Date right_date (right._value, _dateformat);
result._raw = result._value = (left_date == right_date)
? "true"