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)
{
// 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;
+ zone = tz;
}
DateTime DateTime::operator+(const TimeDelta &td) const
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;
}
if(year<-289701 || year>293641)
throw InvalidState("DateTime is not representable as a 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_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));
+ int m = abs(static_cast<int>(offs/Time::min));
ss<<(offs<zero ? '+' : '-')<<setw(2)<<m/60<<':'<<setw(2)<<m%60;
- result+=ss.str();
+ result += ss.str();
}
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;
+ 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;
+ 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();
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;
}
}
}
projects / libs / core.git / blobdiff