GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Variant: handled the case of empty strings being coerced into ISO8601d

Browse source
This commit is contained in:
Paul Beckingham 2015-10-13 13:25:14 -04:00
parent 21946d7611
commit dc92e7ca32
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Variant.cpp
View file

@ -848,6 +848,9 @@ bool Variant::operator== (const Variant& other) const
return left._string == right._string; return left._string == right._string;
case type_date: case type_date:
if (left.trivial () || right.trivial ())
return false;
left.cast (type_date); left.cast (type_date);
return left._date == right._date; return left._date == right._date;
@ -866,6 +869,9 @@ bool Variant::operator== (const Variant& other) const
case type_string: case type_string:
case type_date: case type_date:
case type_duration: case type_duration:
if (left.trivial () || right.trivial ())
return false;
right.cast (type_date); right.cast (type_date);
return left._date == right._date; return left._date == right._date;
} }
@ -1097,6 +1103,9 @@ bool Variant::operator_partial (const Variant& other) const
// Same-day comparison. // Same-day comparison.
case type_date: case type_date:
{ {
if (left.trivial () || right.trivial ())
return false;
left.cast (type_date); left.cast (type_date);
ISO8601d left_date (left._date); ISO8601d left_date (left._date);
ISO8601d right_date (right._date); ISO8601d right_date (right._date);
@ -1113,10 +1122,13 @@ bool Variant::operator_partial (const Variant& other) const
switch (right._type) switch (right._type)
{ {
// Same-day comparison. // Same-day comparison.
case type_string:
if (left.trivial () || right.trivial ())
return false;
case type_boolean: case type_boolean:
case type_integer: case type_integer:
case type_real: case type_real:
case type_string:
case type_date: case type_date:
case type_duration: case type_duration:
{ {
@ -1540,7 +1552,6 @@ Variant& Variant::operator/= (const Variant& other)
switch (_type) switch (_type)
{ {
case type_boolean: case type_boolean:
throw std::string (STRING_VARIANT_DIV_BOOL); throw std::string (STRING_VARIANT_DIV_BOOL);
break; break;