X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=2d7c19585cefeea0838b045643a9b9aaac588db7;hb=cd89068b8ebafdc0f888c1aa21498bb93b55d814;hp=4fcec9641f4bf23a2ac25c4c17c5f23c24bd7bd9;hpb=80bbee2f401b4af71cb1b80508bdb0d2bb61fa40;p=libs%2Fcore.git

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 4fcec96..2d7c195 100644
--- 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"
 
@@ -9,10 +9,10 @@ using namespace std;
 
 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)
 	{
@@ -40,9 +40,6 @@ inline int cmp_(T a, T b)
 
 }
 
-#include <iostream>
-using namespace std;
-
 namespace Msp {
 namespace Time {
 
@@ -58,7 +55,7 @@ DateTime::DateTime(const TimeStamp &ts):
 	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),
@@ -66,14 +63,40 @@ DateTime::DateTime(int32_t y, uint8_t m, uint8_t 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;
 
@@ -171,7 +194,7 @@ TimeStamp DateTime::get_timestamp() const
 	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)
@@ -222,9 +245,9 @@ string DateTime::format(const string &fmt) const
 	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)
 	{
@@ -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