/* $Id$ */
#include <sstream>
#include <iomanip>
-#include <msp/error.h>
+#include "../core/except.h"
#include "datetime.h"
#include "timestamp.h"
namespace {
-inline bool is_leap_year(int32_t y)
+inline bool is_leap_year(int y)
{ return y%4==0 && (y%100 || y%400==0); }
-inline uint8_t month_days(int32_t y, uint8_t m)
+inline unsigned char month_days(int y, unsigned char m)
{
switch(m)
{
}
-#include <iostream>
-using namespace std;
-
namespace Msp {
namespace Time {
add_raw(ts.raw());
}
-DateTime::DateTime(int32_t y, uint8_t m, uint8_t d):
+DateTime::DateTime(int y, unsigned char m, unsigned char d):
year(y),
month(m),
mday(d),
minute(0),
second(0),
usec(0)
-{ }
+{
+ validate();
+}
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s):
+ year(y),
+ month(m),
+ mday(d),
+ hour(h),
+ minute(n),
+ second(s),
+ usec(0)
+{
+ validate();
+}
+
+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)
+{
+ validate();
+}
-void DateTime::add_days(int32_t days)
+void DateTime::add_days(int 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;
if(year<-289701 || year>293641)
throw Exception("DateTime is not representable as a TimeStamp");
- int64_t raw=(((hour*60LL)+minute)*60+second)*1000000+usec;
+ RawTime raw=(((hour*60LL)+minute)*60+second)*1000000+usec;
int days=(year-1970)*365;
days+=(year-1)/4-(year-1)/100+(year-1)/400-477;
for(unsigned i=1; i<month; ++i)
return ss.str();
}
-void DateTime::add_raw(int64_t raw)
+void DateTime::add_raw(RawTime raw)
{
- int32_t days=raw/86400000000LL;
+ int days=static_cast<int>(raw/86400000000LL);
raw%=86400000000LL;
if(raw<0)
{
}
}
+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