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

Variant

Browse Source 
- Added specialized handling for 'priority' attributes when compared using the
  <, <=, > or >= operators.
This commit is contained in:
Paul Beckingham
2014-05-31 10:02:50 -04:00
parent ba8c007ace
commit 4694cfe0fe
1 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Variant.cpp
View File

@@ -280,7 +280,18 @@ bool Variant::operator< (const Variant& other) const
case type_boolean: right.cast (type_string); return left._string < right._string; case type_boolean: right.cast (type_string); return left._string < right._string;
case type_integer: right.cast (type_string); return left._string < right._string; case type_integer: right.cast (type_string); return left._string < right._string;
case type_real: right.cast (type_string); return left._string < right._string; case type_real: right.cast (type_string); return left._string < right._string;
case type_string: return left._string < right._string; case type_string:
if (left.source () == "priority" || right.source () == "priority")
{
if (left._string != "H" && right._string == "H") return true;
else if (left._string == "L" && right._string == "M") return true;
else if (left._string == "" && right._string != "") return true;
else return false;
}
else
{
return left._string < right._string;
}
case type_date: left.cast (type_date); return left._date < right._date; case type_date: left.cast (type_date); return left._date < right._date;
case type_duration: left.cast (type_duration); return left._duration < right._duration; case type_duration: left.cast (type_duration); return left._duration < right._duration;
} }
@@ -374,7 +385,19 @@ bool Variant::operator<= (const Variant& other) const
case type_boolean: right.cast (type_string); return left._string <= right._string; case type_boolean: right.cast (type_string); return left._string <= right._string;
case type_integer: right.cast (type_string); return left._string <= right._string; case type_integer: right.cast (type_string); return left._string <= right._string;
case type_real: right.cast (type_string); return left._string <= right._string; case type_real: right.cast (type_string); return left._string <= right._string;
case type_string: return left._string <= right._string; case type_string:
if (left.source () == "priority" || right.source () == "priority")
{
if (left._string == right._string ) return true;
else if ( right._string == "H") return true;
else if (left._string == "L" && right._string == "M") return true;
else if (left._string == "" ) return true;
else return false;
}
else
{
return left._string <= right._string;
}
case type_date: left.cast (type_date); return left._date <= right._date; case type_date: left.cast (type_date); return left._date <= right._date;
case type_duration: left.cast (type_duration); return left._duration <= right._duration; case type_duration: left.cast (type_duration); return left._duration <= right._duration;
} }
@@ -468,7 +491,18 @@ bool Variant::operator> (const Variant& other) const
case type_boolean: right.cast (type_string); return left._string > right._string; case type_boolean: right.cast (type_string); return left._string > right._string;
case type_integer: right.cast (type_string); return left._string > right._string; case type_integer: right.cast (type_string); return left._string > right._string;
case type_real: right.cast (type_string); return left._string > right._string; case type_real: right.cast (type_string); return left._string > right._string;
case type_string: return left._string > right._string; case type_string:
if (left.source () == "priority" || right.source () == "priority")
{
if (left._string == "H" && right._string != "H") return true;
else if (left._string == "M" && right._string == "L") return true;
else if (left._string != "" && right._string == "") return true;
else return false;
}
else
{
return left._string> right._string;
}
case type_date: left.cast (type_date); return left._date > right._date; case type_date: left.cast (type_date); return left._date > right._date;
case type_duration: left.cast (type_duration); return left._duration > right._duration; case type_duration: left.cast (type_duration); return left._duration > right._duration;
} }
@@ -562,7 +596,19 @@ bool Variant::operator>= (const Variant& other) const
case type_boolean: right.cast (type_string); return left._string >= right._string; case type_boolean: right.cast (type_string); return left._string >= right._string;
case type_integer: right.cast (type_string); return left._string >= right._string; case type_integer: right.cast (type_string); return left._string >= right._string;
case type_real: right.cast (type_string); return left._string >= right._string; case type_real: right.cast (type_string); return left._string >= right._string;
case type_string: return left._string >= right._string; case type_string:
if (left.source () == "priority" || right.source () == "priority")
{
if (left._string == right._string ) return true;
else if (left._string == "H" ) return true;
else if (left._string == "M" && right._string == "L") return true;
else if ( right._string == "" ) return true;
else return false;
}
else
{
return left._string >= right._string;
}
case type_date: left.cast (type_date); return left._date >= right._date; case type_date: left.cast (type_date); return left._date >= right._date;
case type_duration: left.cast (type_duration); return left._duration >= right._duration; case type_duration: left.cast (type_duration); return left._duration >= right._duration;
} }