X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=8feeff2f0d21a798f153607ea3f3d02e93b36fd2;hp=283a7c6c7578c73484224e27615f92fe78d7ee79;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hpb=3fd9d04e84cdd72aabe8f9878f9e8ff006275bb6

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 283a7c6..8feeff2 100644
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,8 +1,6 @@
-/* $Id$ */
 #include <cstdlib>
-#include <sstream>
-#include <iomanip>
-#include "../core/except.h"
+#include <stdexcept>
+#include <msp/strings/format.h>
 #include "datetime.h"
 #include "timestamp.h"
 #include "units.h"
@@ -71,82 +69,118 @@ DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, uns
 	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)
+{
+	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)
+		throw out_of_range("DateTime::DateTime second");
+	if(minute>=60)
+		throw out_of_range("DateTime::DateTime minute");
+	if(hour>=24)
+		throw out_of_range("DateTime::DateTime hour");
+	if(month<1 || month>12)
+		throw out_of_range("DateTime::DateTime month");
+	if(mday<1 || mday>month_days(year, month))
+		throw out_of_range("DateTime::DateTime mday");
+}
+
 void DateTime::add_days(int days)
 {
-	int new_year=year;
+	int new_year = year;
 
 	/* Leap years have a 400 year cycle, so any 400 consecutive years have a
-	constant number of days (400*365+97=146097) */
-	new_year+=days/146097*400;
-	days%=146097;
+	constant number of days (400*365+97 = 146097) */
+	new_year += days/146097*400;
+	days %= 146097;
 
 	if(days<0)
 	{
-		new_year-=400;
-		days+=146097;
+		new_year -= 400;
+		days += 146097;
 	}
 
 	// Fudge factor for leap day
-	int fudge=(month<=2)?1:0;
+	int fudge = (month<=2)?1:0;
 
 	// (Almost) every 4 year cycle has 1 leap year and 3 normal years
-	unsigned cycles=days/1461;
-	days%=1461;
+	unsigned cycles = days/1461;
+	days %= 1461;
 
-	new_year+=cycles*4;
+	new_year += cycles*4;
 
 	// See how many non-leap-years we counted as leap years and reclaim the lost days
 	// XXX This breaks with negative years
-	unsigned missed_leap_days=((year-fudge)%100+cycles*4)/100;
+	unsigned missed_leap_days = ((year-fudge)%100+cycles*4)/100;
 	if((year-fudge)%400+cycles*4>=400)
 		--missed_leap_days;
 
-	days+=missed_leap_days;
+	days += missed_leap_days;
 
 	// Count single years from the 4 year cycle
-	cycles=days/365;
-	days%=365;
+	cycles = days/365;
+	days %= 365;
 
-	new_year+=cycles;
+	new_year += cycles;
 
-	if((year-fudge)%4+cycles>=4)
+	if((year-fudge)%4+cycles>=4 && (new_year%100>=4 || new_year%400<4))
 	{
 		// We passed a leap year - decrement days
 		if(days==0)
 		{
-			days=is_leap_year(new_year-fudge)?365:364;
+			days = is_leap_year(new_year-fudge)?365:364;
 			--new_year;
 		}
 		else
 			--days;
 	}
 
-	year=new_year;
+	year = new_year;
 
 	// Step months
 	while(mday+days>month_days(year, month))
 	{
-		days-=month_days(year, month);
+		days -= month_days(year, month);
 		++month;
 		if(month>12)
 		{
 			++year;
-			month=1;
+			month = 1;
 		}
 	}
 
-	mday+=days;
+	mday += days;
 }
 
 void DateTime::set_timezone(const TimeZone &tz)
 {
-	zone=tz;
+	zone = tz;
 }
 
 void DateTime::convert_timezone(const TimeZone &tz)
 {
-	add_raw((zone.get_offset()-tz.get_offset()).raw());
-	zone=tz;
+	add_raw((tz.get_offset()-zone.get_offset()).raw());
+	zone = tz;
 }
 
 DateTime DateTime::operator+(const TimeDelta &td) const
@@ -177,19 +211,19 @@ DateTime &DateTime::operator-=(const TimeDelta &td)
 
 int DateTime::cmp(const DateTime &dt) const
 {
-	if(int c=cmp_(year, dt.year))
+	if(int c = cmp_(year, dt.year))
 		return c;
-	if(int c=cmp_(month, dt.month))
+	if(int c = cmp_(month, dt.month))
 		return c;
-	if(int c=cmp_(mday, dt.mday))
+	if(int c = cmp_(mday, dt.mday))
 		return c;
-	if(int c=cmp_(hour, dt.hour))
+	if(int c = cmp_(hour, dt.hour))
 		return c;
-	if(int c=cmp_(minute, dt.minute))
+	if(int c = cmp_(minute, dt.minute))
 		return c;
-	if(int c=cmp_(second, dt.second))
+	if(int c = cmp_(second, dt.second))
 		return c;
-	if(int c=cmp_(usec, dt.usec))
+	if(int c = cmp_(usec, dt.usec))
 		return c;
 	return 0;
 }
@@ -197,24 +231,23 @@ int DateTime::cmp(const DateTime &dt) const
 TimeStamp DateTime::get_timestamp() const
 {
 	if(year<-289701 || year>293641)
-		throw Exception("DateTime is not representable as a TimeStamp");
+		throw range_error("DateTime::get_timestamp");
 
-	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;
+	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)
-		days+=month_days(year, i);
-	days+=mday-1;
+		days += month_days(year, i);
+	days += mday-1;
 
-	raw+=days*86400000000LL;
+	raw += days*86400000000LL;
 
 	return TimeStamp(raw);
 }
 
 string DateTime::format(const string &fmt) const
 {
-	ostringstream ss;
-	ss.fill('0');
+	string result;
 	for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
 	{
 		if(*i=='%')
@@ -223,87 +256,60 @@ string DateTime::format(const string &fmt) const
 			if(i==fmt.end())
 				break;
 			else if(*i=='d')
-				ss<<setw(2)<<int(mday);
+				result += Msp::format("%02d", mday);
 			else if(*i=='H')
-				ss<<setw(2)<<int(hour);
+				result += Msp::format("%02d", hour);
 			else if(*i=='I')
-				ss<<setw(2)<<hour%12;
+				result += Msp::format("%02d", hour%12);
 			else if(*i=='m')
-				ss<<setw(2)<<int(month);
+				result += Msp::format("%02d", month);
 			else if(*i=='M')
-				ss<<setw(2)<<int(minute);
+				result += Msp::format("%02d", minute);
 			else if(*i=='p')
-				ss<<((hour>=12) ? "PM" : "AM");
+				result += ((hour>=12) ? "PM" : "AM");
 			else if(*i=='S')
-				ss<<setw(2)<<int(second);
+				result += Msp::format("%02d", second);
 			else if(*i=='y')
-				ss<<setw(2)<<year%100;
+				result += Msp::format("%02d", year%100);
 			else if(*i=='Y')
-				ss<<setw(4)<<internal<<year;
+				result += Msp::format("%04d", year);
 			else if(*i=='%')
-				ss<<'%';
+				result += '%';
 		}
 		else
-			ss<<*i;
+			result += *i;
 	}
 
-	return ss.str();
+	return result;
 }
 
 string DateTime::format_rfc3339() const
 {
-	string result=format("%Y-%m-%dT%H:%M:%S");
-	if(const TimeDelta &offs=zone.get_offset())
+	string result = format("%Y-%m-%dT%H:%M:%S");
+	if(const TimeDelta &offs = zone.get_offset())
 	{
-		ostringstream ss;
-		ss.fill('0');
-		int m=abs(static_cast<int>(offs/Time::min));
-		ss<<(offs<zero ? '+' : '-')<<setw(2)<<m/60<<':'<<setw(2)<<m%60;
-		result+=ss.str();
+		int m = abs(static_cast<int>(offs/Time::min));
+		result += Msp::format("%c%02d:%02d", (offs<zero ? '-' : '+'), m/60, m%60);
 	}
 	else
-		result+='Z';
+		result += 'Z';
 	return result;
 }
 
-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)
-{
-	year=y;
-	month=m;
-	mday=d;
-	hour=h;
-	minute=n;
-	second=s;
-	usec=u;
-	validate();
-}
-
 void DateTime::add_raw(RawTime raw)
 {
-	int days=static_cast<int>(raw/86400000000LL);
-	raw%=86400000000LL;
+	int days = static_cast<int>(raw/86400000000LL);
+	raw %= 86400000000LL;
 	if(raw<0)
 	{
 		--days;
-		raw+=86400000000LL;
+		raw += 86400000000LL;
 	}
 
-	usec+=raw%1000000; raw/=1000000;
-	second+=raw%60;    raw/=60;
-	minute+=raw%60;    raw/=60;
-	hour+=raw%24;      raw/=24;
+	usec+=raw%1000000; raw /= 1000000;
+	second+=raw%60;    raw /= 60;
+	minute+=raw%60;    raw /= 60;
+	hour+=raw%24;      raw /= 24;
 
 	add_days(days);
 	normalize();
@@ -311,41 +317,25 @@ void DateTime::add_raw(RawTime raw)
 
 void DateTime::normalize()
 {
-	second+=usec/1000000;
-	usec%=1000000;
-	minute+=second/60;
-	second%=60;
-	hour+=minute/60;
-	minute%=60;
-	mday+=hour/24;
-	hour%=24;
+	second += usec/1000000;
+	usec %= 1000000;
+	minute += second/60;
+	second %= 60;
+	hour += minute/60;
+	minute %= 60;
+	mday += hour/24;
+	hour %= 24;
 	while(mday>month_days(year, month))
 	{
-		mday-=month_days(year, month);
+		mday -= month_days(year, month);
 		++month;
 		if(month>12)
 		{
 			++year;
-			month=1;
+			month = 1;
 		}
 	}
 }
 
-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