Differences From Artifact [7b98bd3de0]:
- File src/OFDate.m — part of check-in [7d381048fb] at 2016-05-21 22:19:59 on branch trunk — OFDate: Use _mktime64() on Windows (user: js, size: 13811) [annotate] [blame] [check-ins using]
To Artifact [6c84c9ff36]:
- File
src/OFDate.m
— part of check-in
[e4439b7ef8]
at
2016-09-11 22:03:20
on branch trunk
— OFDate: Add support for parsing time zones
This adds %z for parsing time zones. Additionally, this also adds %a and
%b. (user: js, size: 14281) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
140 141 142 143 144 145 146 147 148 149 150 151 152 153 |
31 + 28 + 31 + 30 + 31 + 30,
31 + 28 + 31 + 30 + 31 + 30 + 31,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
};
@implementation OFDate
#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
defined(OF_HAVE_THREADS)
+ (void)initialize
{
if (self == [OFDate class])
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 |
31 + 28 + 31 + 30 + 31 + 30,
31 + 28 + 31 + 30 + 31 + 30 + 31,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
};
static double
tmAndTzToTime(struct tm *tm, int16_t *tz)
{
double seconds;
/* Years */
seconds = (int64_t)(tm->tm_year - 70) * 31536000;
/* Days of leap years, excluding the year to look at */
seconds += (((tm->tm_year + 1899) / 4) - 492) * 86400;
seconds -= (((tm->tm_year + 1899) / 100) - 19) * 86400;
seconds += (((tm->tm_year + 1899) / 400) - 4) * 86400;
/* Leap day */
if (tm->tm_mon >= 2 && (((tm->tm_year + 1900) % 4 == 0 &&
(tm->tm_year + 1900) % 100 != 0) ||
(tm->tm_year + 1900) % 400 == 0))
seconds += 86400;
/* Months */
if (tm->tm_mon < 0 || tm->tm_mon > 12)
@throw [OFInvalidFormatException exception];
seconds += monthToDayOfYear[tm->tm_mon] * 86400;
/* Days */
seconds += (tm->tm_mday - 1) * 86400;
/* Hours */
seconds += tm->tm_hour * 3600;
/* Minutes */
seconds += tm->tm_min * 60;
/* Seconds */
seconds += tm->tm_sec;
/* Time zone */
seconds += -(float)*tz * 60;
return seconds;
}
@implementation OFDate
#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
defined(OF_HAVE_THREADS)
+ (void)initialize
{
if (self == [OFDate class])
|
| ︙ | ︙ | |||
233 234 235 236 237 238 239 240 241 242 243 |
- initWithDateString: (OFString*)string
format: (OFString*)format
{
self = [super init];
@try {
struct tm tm = { 0 };
tm.tm_isdst = -1;
if (of_strptime([string UTF8String], [format UTF8String],
| > | < < < < < < < < < < | < < < < < < < < < < < < > > > > > > | > | | | | > > | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 |
- initWithDateString: (OFString*)string
format: (OFString*)format
{
self = [super init];
@try {
struct tm tm = { 0 };
int16_t tz = 0;
tm.tm_isdst = -1;
if (of_strptime([string UTF8String], [format UTF8String],
&tm, &tz) == NULL)
@throw [OFInvalidFormatException exception];
_seconds = tmAndTzToTime(&tm, &tz);
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- initWithLocalDateString: (OFString*)string
format: (OFString*)format
{
self = [super init];
@try {
struct tm tm = { 0 };
/*
* of_strptime() can never set this to INT16_MAX, no matter
* what is passed to it, so this is a safe way to figure out if
* the date contains a time zone.
*/
int16_t tz = INT16_MAX;
tm.tm_isdst = -1;
if (of_strptime([string UTF8String], [format UTF8String],
&tm, &tz) == NULL)
@throw [OFInvalidFormatException exception];
if (tz == INT16_MAX) {
#ifndef OF_WINDOWS
if ((_seconds = mktime(&tm)) == -1)
@throw [OFInvalidFormatException exception];
#else
if ((_seconds = _mktime64(&tm)) == -1)
@throw [OFInvalidFormatException exception];
#endif
} else
_seconds = tmAndTzToTime(&tm, &tz);
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
|
| ︙ | ︙ |