Use default member initializers and constructor delegation

[libs/core.git] / source / time / datetime.cpp

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index c77796f7bc0bd8c8cd378d739fb5a458f006a491..f61e62e12ae2b3a18abc91fc6dcf9f8c953b06a5 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <stdexcept>
 #include <msp/strings/format.h>
+#include <msp/strings/regex.h>
 #include "datetime.h"
 #include "timestamp.h"
 
@@ -44,52 +45,32 @@ namespace Time {
 
 DateTime::DateTime(const TimeStamp &ts)
 {
-       init(ts);
+       add_raw(ts.raw());
 }
 
-DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz)
+DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz):
+       DateTime(ts)
 {
-       init(ts);
        convert_timezone(tz);
 }
 
-DateTime::DateTime(int y, unsigned char m, unsigned char d)
-{
-       init(y, m, d, 0, 0, 0, 0);
-}
-
-DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s)
-{
-       init(y, m, d, h, n, s, 0);
-}
-
-DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
-{
-       init(y, m, d, h, n, s, u);
-}
-
-void DateTime::init(const TimeStamp &ts)
-{
-       year = 1970;
-       month = 1;
-       mday = 1;
-       hour = 0;
-       minute = 0;
-       second = 0;
-       usec = 0;
-       add_raw(ts.raw());
-}
-
-void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
+DateTime::DateTime(int y, unsigned char m, unsigned char d):
+       DateTime(y, m, d, 0, 0, 0, 0)
+{ }
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s):
+       DateTime(y, m, d, h, n, s, 0)
+{ }
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u):
+       year(y),
+       month(m),
+       mday(d),
+       hour(h),
+       minute(n),
+       second(s),
+       usec(u)
 {
-       year = y;
-       month = m;
-       mday = d;
-       hour = h;
-       minute = n;
-       second = s;
-       usec = u;
-
        if(usec>=1000000)
                throw out_of_range("DateTime::DateTime usec");
        if(second>=60)
@@ -104,6 +85,46 @@ void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, un
                throw out_of_range("DateTime::DateTime mday");
 }
 
+DateTime DateTime::parse_rfc3339(const string &str)
+{
+       static Regex re("^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(.([0-9]+))?(Z|[-+]([0-9]{2}):([0-9]{2}))$");
+
+       RegMatch m = re.match(str);
+       if(!m)
+               throw invalid_argument("DateTime::parse_rfc3339");
+
+       unsigned year = lexical_cast<unsigned>(m[1].str);
+       unsigned month = lexical_cast<unsigned>(m[2].str);
+       unsigned mday = lexical_cast<unsigned>(m[3].str);
+       unsigned hr = lexical_cast<unsigned>(m[4].str);
+       unsigned minute = lexical_cast<unsigned>(m[5].str);
+       unsigned second = lexical_cast<unsigned>(m[6].str);
+       unsigned us = 0;
+       const string &sec_frac = m[8].str;
+       if(!sec_frac.empty())
+       {
+               us = lexical_cast<unsigned>(sec_frac);
+               for(unsigned i=sec_frac.size(); i<6; ++i)
+                       us *= 10;
+               for(unsigned i=sec_frac.size(); i>6; --i)
+                       us /= 10;
+       }
+
+       DateTime result = DateTime(year, month, mday, hr, minute, second, us);
+
+       int tzoff = 0;
+       if(m[9].str!="Z")
+       {
+               tzoff = lexical_cast<unsigned>(m[10].str)*60+lexical_cast<unsigned>(m[11].str);
+               if(m[9].str[0]=='-')
+                       tzoff = -tzoff;
+       }
+
+       result.set_timezone(tzoff);
+
+       return result;
+}
+
 void DateTime::add_days(int days)
 {
        int new_year = year;
@@ -247,7 +268,7 @@ TimeStamp DateTime::get_timestamp() const
 string DateTime::format(const string &fmt) const
 {
        string result;
-       for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
+       for(auto i=fmt.begin(); i!=fmt.end(); ++i)
        {
                if(*i=='%')
                {
@@ -285,6 +306,8 @@ string DateTime::format(const string &fmt) const
 string DateTime::format_rfc3339() const
 {
        string result = format("%Y-%m-%dT%H:%M:%S");
+       if(usec)
+               result += Msp::format(".%06d", usec);
        if(const TimeDelta &offs = zone.get_offset())
        {
                int m = abs(static_cast<int>(offs/Time::min));