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

ISO8601: Modifed ::format to use only precise values.

Browse source
This commit is contained in:
Paul Beckingham 2015-08-11 23:13:23 -04:00
parent f10f7cf690
commit 4a6df38e6a
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ISO8601.cpp
View file

@ -713,7 +713,7 @@ bool ISO8601p::parse (const std::string& input, std::string::size_type& start)
{ {
start = original_start + n.cursor (); start = original_start + n.cursor ();
// Linear lookup - should be logarithmic. // Linear lookup - should instead be logarithmic.
for (unsigned int i = 0; i < NUM_DURATIONS; i++) for (unsigned int i = 0; i < NUM_DURATIONS; i++)
{ {
if (durations[i].unit == unit && if (durations[i].unit == unit &&
@ -761,7 +761,7 @@ bool ISO8601p::parse (const std::string& input, std::string::size_type& start)
start = original_start + n.cursor (); start = original_start + n.cursor ();
double quantity = strtod (number.c_str (), NULL); double quantity = strtod (number.c_str (), NULL);
// Linear lookup - should be logarithmic. // Linear lookup - should instead be logarithmic.
double seconds = 1; double seconds = 1;
for (unsigned int i = 0; i < NUM_DURATIONS; i++) for (unsigned int i = 0; i < NUM_DURATIONS; i++)
{ {
@ -800,14 +800,10 @@ const std::string ISO8601p::format () const
int seconds = t % 60; t /= 60; int seconds = t % 60; t /= 60;
int minutes = t % 60; t /= 60; int minutes = t % 60; t /= 60;
int hours = t % 24; t /= 24; int hours = t % 24; t /= 24;
int days = t % 30; t /= 30; int days = t;
int months = t % 12; t /= 12;
int years = t;
std::stringstream s; std::stringstream s;
s << 'P'; s << 'P';
if (years) s << years << 'Y';
if (months) s << months << 'M';
if (days) s << days << 'D'; if (days) s << days << 'D';
if (hours || minutes || seconds) if (hours || minutes || seconds)