Add validation for DateTime constructor parameters

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

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 4fcec9641f4bf23a2ac25c4c17c5f23c24bd7bd9..4c109758eb0e95d8b191d50152866856bbe48b46 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,7 +1,7 @@
 /* $Id$ */
 #include <sstream>
 #include <iomanip>
-#include <msp/error.h>
+#include "../core/except.h"
 #include "datetime.h"
 #include "timestamp.h"
 
@@ -40,9 +40,6 @@ inline int cmp_(T a, T b)
 
 }
 
-#include <iostream>
-using namespace std;
-
 namespace Msp {
 namespace Time {
 
@@ -66,14 +63,40 @@ DateTime::DateTime(int32_t y, uint8_t m, uint8_t d):
        minute(0),
        second(0),
        usec(0)
-{ }
+{
+       validate();
+}
+
+DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_t s):
+       year(y),
+       month(m),
+       mday(d),
+       hour(h),
+       minute(n),
+       second(s),
+       usec(0)
+{
+       validate();
+}
+
+DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_t s, uint32_t u):
+       year(y),
+       month(m),
+       mday(d),
+       hour(h),
+       minute(n),
+       second(s),
+       usec(u)
+{
+       validate();
+}
 
 void DateTime::add_days(int32_t days)
 {
        unsigned new_year=year;
 
        /* Leap years have a 400 year cycle, so any 400 consecutive years have a
-       constant number of days */
+       constant number of days (400*365+97=146097) */
        new_year+=days/146097*400;
        days%=146097;
 
@@ -263,5 +286,21 @@ void DateTime::normalize()
        }
 }
 
+void DateTime::validate() const
+{
+       if(usec>=1000000)
+               throw InvalidParameterValue("Microseconds out of range");
+       if(second>=60)
+               throw InvalidParameterValue("Seconds out of range");
+       if(minute>=60)
+               throw InvalidParameterValue("Minutes out of range");
+       if(hour>=24)
+               throw InvalidParameterValue("Hours out of range");
+       if(month<1 || month>12)
+               throw InvalidParameterValue("Month out of range");
+       if(mday<1 || mday>month_days(year, month))
+               throw InvalidParameterValue("Day of month out of range");
+}
+
 } // namespace Time
 } // namespace Msp