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

Variant

Browse Source 
- Implemented partial match for strings.
This commit is contained in:
Paul Beckingham
2014-05-27 00:08:07 -04:00
parent 0664cb5689
commit 0b160292c0
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Variant.cpp
View File

@@ -718,6 +718,7 @@ bool Variant::operator_partial (const Variant& other) const
case type_integer: left.cast (type_integer); return left._integer == right._integer; case type_integer: left.cast (type_integer); return left._integer == right._integer;
case type_real: left.cast (type_real); return left._real == right._real; case type_real: left.cast (type_real); return left._real == right._real;
case type_string: left.cast (type_string); return left._string == right._string; case type_string: left.cast (type_string); return left._string == right._string;
// TODO Implement same-day comparison.
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;
} }
@@ -731,6 +732,7 @@ bool Variant::operator_partial (const Variant& other) const
case type_integer: return left._integer == right._integer; case type_integer: return left._integer == right._integer;
case type_real: left.cast (type_real); return left._real == right._real; case type_real: left.cast (type_real); return left._real == right._real;
case type_string: left.cast (type_string); return left._string == right._string; case type_string: left.cast (type_string); return left._string == right._string;
// TODO Implement same-day comparison.
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;
} }
@@ -744,6 +746,7 @@ bool Variant::operator_partial (const Variant& other) const
case type_integer: right.cast (type_real); return left._real == right._real; case type_integer: right.cast (type_real); return left._real == right._real;
case type_real: return left._real == right._real; case type_real: return left._real == right._real;
case type_string: left.cast (type_string); return left._string == right._string; case type_string: left.cast (type_string); return left._string == right._string;
// TODO Implement same-day comparison.
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;
} }
@@ -756,7 +759,18 @@ bool Variant::operator_partial (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:
{
// Why the "if" instead of "min"? This is an attempt to eliminate one
// std::string::substr call.
int left_length = left._string.length ();
int right_length = right._string.length ();
if (left_length < right_length)
return left._string == right._string.substr (0, left_length);
else
return left._string.substr (0, right_length) == right._string;
}
// TODO Implement same-day comparison.
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;
} }
@@ -766,11 +780,17 @@ bool Variant::operator_partial (const Variant& other) const
switch (right._type) switch (right._type)
{ {
case type_unknown: throw std::string ("Cannot equate unknown type"); case type_unknown: throw std::string ("Cannot equate unknown type");
// TODO Implement same-day comparison.
case type_boolean: right.cast (type_date); return left._date == right._date; case type_boolean: right.cast (type_date); return left._date == right._date;
// TODO Implement same-day comparison.
case type_integer: right.cast (type_date); return left._date == right._date; case type_integer: right.cast (type_date); return left._date == right._date;
// TODO Implement same-day comparison.
case type_real: right.cast (type_date); return left._date == right._date; case type_real: right.cast (type_date); return left._date == right._date;
// TODO Implement same-day comparison.
case type_string: right.cast (type_date); return left._date == right._date; case type_string: right.cast (type_date); return left._date == right._date;
// TODO Implement same-day comparison.
case type_date: return left._date == right._date; case type_date: return left._date == right._date;
// TODO Implement same-day comparison.
case type_duration: return left._date == right._duration; case type_duration: return left._date == right._duration;
} }
break; break;
@@ -783,7 +803,9 @@ bool Variant::operator_partial (const Variant& other) const
case type_integer: right.cast (type_duration); return left._duration == right._duration; case type_integer: right.cast (type_duration); return left._duration == right._duration;
case type_real: right.cast (type_duration); return left._duration == right._duration; case type_real: right.cast (type_duration); return left._duration == right._duration;
case type_string: right.cast (type_duration); return left._duration == right._duration; case type_string: right.cast (type_duration); return left._duration == right._duration;
// TODO Implement same-day comparison.
case type_date: return left._duration == right._date; case type_date: return left._duration == right._date;
// TODO Implement same-day comparison.
case type_duration: return left._duration == right._duration; case type_duration: return left._duration == right._duration;
} }
break; break;

4
test/feature.891.t
View File

@@ -61,11 +61,11 @@ EOF
my $output = qx{../src/task rc:bug.rc 1 info 2>&1}; my $output = qx{../src/task rc:bug.rc 1 info 2>&1};
my ($uuid) = $output =~ /UUID\s+(\S{36})/ms; my ($uuid) = $output =~ /UUID\s+(\S{36})/ms;
$output = qx{../src/task rc:bug.rc $uuid list rc.debug:1 2>&1}; $output = qx{../src/task rc:bug.rc $uuid list 2>&1};
like ($output, qr/one/, "Found with $uuid"); like ($output, qr/one/, "Found with $uuid");
my ($short) = $uuid =~ /^(.{35})/; my ($short) = $uuid =~ /^(.{35})/;
$output = qx{../src/task rc:bug.rc $short list rc.debug:1 2>&1}; $output = qx{../src/task rc:bug.rc $short list 2>&1};
like ($output, qr/one/, "Found with $short"); like ($output, qr/one/, "Found with $short");
($short) = $uuid =~ /^(.{34})/; ($short) = $uuid =~ /^(.{34})/;