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

ISO8601: Removed ambiguous format support

Browse source 
- Disallows 2-digit times, such as 14 (2pm).  Now requires at least minutes
  included as well. This is likely to need further review, and possible dropping
  of all non-extended date forms (hhmmss, yyyymmdd), otherwise there will always
  be confusion between ID, UUID and ISO8601 dates.
- Removed 2-digit time tests.
This commit is contained in:
Paul Beckingham 2015-06-25 23:20:59 -04:00
parent 290674d7c1
commit fcfc1d1a31
2 changed files with 44 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/ISO8601.cpp
View file

@ -47,7 +47,7 @@ ISO8601d::operator time_t () const
////////////////////////////////////////////////////////////////////////////////
// By default, ISO8601d allows ambiguous dates, such as YYYY, YYYYMMDD, HHMMSS.
// These are also valid numbers. Setting ambiguity to false inhibites the
// These are also valid numbers. Setting ambiguity to false inhibits the
// parsing of these as dates.
void ISO8601d::ambiguity (bool value)
{
@ -66,7 +66,7 @@ void ISO8601d::ambiguity (bool value)
// | date 'T' time
// | date
// | time-ext 'Z'
// | time-ext offset-ext
// | time-ext offset-ext Not needed
// | time-ext
// | time 'Z'
// | time offset
@ -464,7 +464,7 @@ bool ISO8601d::parse_time_ext (Nibbler& n)
}
////////////////////////////////////////////////////////////////////////////////
// hh[mm[ss]]
// hhmm[ss]
bool ISO8601d::parse_time (Nibbler& n, bool ambiguous)
{
if (!ambiguous)
@ -473,19 +473,15 @@ bool ISO8601d::parse_time (Nibbler& n, bool ambiguous)
Nibbler backup (n);
int seconds = 0;
int hh;
if (n.getDigit2 (hh))
int mm;
if (n.getDigit2 (hh) &&
n.getDigit2 (mm))
{
seconds = hh * 3600;
seconds = hh * 3600 + mm * 60;
int mm;
if (n.getDigit2 (mm))
{
seconds += mm * 60;
int ss;
if (n.getDigit2 (ss))
seconds += ss;
}
int ss;
if (n.getDigit2 (ss))
seconds += ss;
_seconds = seconds;
if (!Lexer::isDigit (n.next ()))