Differences From Artifact [ba324e05e2]:
- File src/OFDate.m — part of check-in [c57f9fe4fb] at 2011-01-01 14:58:50 on branch trunk — Add +[distantFuture] and +[distantPast] to OFDate. (user: js, size: 7037) [annotate] [blame] [check-ins using]
To Artifact [a3f6814aa0]:
- File
src/OFDate.m
— part of check-in
[c084907c2c]
at
2011-01-01 16:12:03
on branch trunk
— Multiple OFDate changes.
* Don't expose time_t to the user.
* Use better return types for -[minute] etc.
* Add +[dateWithTimeIntervalSinceNow:].
* Add -[dateByAddingTimeInterval:]. (user: js, size: 9153) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
27 28 29 30 31 32 33 34 35 | # import "OFThread.h" static OFMutex *mutex; #endif #ifdef HAVE_GMTIME_R # define GMTIME_RET(field) \ struct tm tm; \ \ | > > > > | > > > > | > > > > | > > > > | > > > > | > > > > | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
# import "OFThread.h"
static OFMutex *mutex;
#endif
#ifdef HAVE_GMTIME_R
# define GMTIME_RET(field) \
time_t sec_ = sec; \
struct tm tm; \
\
if (sec != sec_) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
if (gmtime_r(&sec_, &tm) == NULL) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
return tm.field;
# define LOCALTIME_RET(field) \
time_t sec_ = sec; \
struct tm tm; \
\
if (sec != sec_) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
if (localtime_r(&sec_, &tm) == NULL) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
return tm.field;
#else
# ifdef OF_THREADS
# define GMTIME_RET(field) \
time_t sec_ = sec; \
struct tm *tm; \
\
if (sec != sec_) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
[mutex lock]; \
\
@try { \
if ((tm = gmtime(&sec_)) == NULL) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
return tm->field; \
} @finally { \
[mutex unlock]; \
}
# define LOCALTIME_RET(field) \
time_t sec_ = sec; \
struct tm *tm; \
\
if (sec != sec_) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
[mutex lock]; \
\
@try { \
if ((tm = localtime(&sec_)) == NULL) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
return tm->field; \
} @finally { \
[mutex unlock]; \
}
# else
# define GMTIME_RET(field) \
time_t sec_ = sec; \
struct tm *tm; \
\
if (sec != sec_) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
if ((tm = gmtime(&sec_)) == NULL) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
return tm->field;
# define LOCALTIME_RET(field) \
time_t sec_ = sec; \
struct tm *tm; \
\
if (sec != sec_) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
if ((tm = localtime(&sec_)) == NULL) \
@throw [OFOutOfRangeException newWithClass: isa]; \
\
return tm->field;
# endif
#endif
@implementation OFDate
|
| ︙ | ︙ | |||
101 102 103 104 105 106 107 |
#endif
+ date
{
return [[[self alloc] init] autorelease];
}
| | | | > > > > > > > > > > > > | > | > | > | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 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 |
#endif
+ date
{
return [[[self alloc] init] autorelease];
}
+ dateWithTimeIntervalSince1970: (int64_t)sec
{
return [[[self alloc] initWithTimeIntervalSince1970: sec] autorelease];
}
+ dateWithTimeIntervalSince1970: (int64_t)sec
microseconds: (uint32_t)usec
{
return [[[self alloc] initWithTimeIntervalSince1970: sec
microseconds: usec] autorelease];
}
+ dateWithTimeIntervalSinceNow: (int64_t)sec
{
return [[[self alloc] initWithTimeIntervalSinceNow: sec] autorelease];
}
+ dateWithTimeIntervalSinceNow: (int64_t)sec
microseconds: (uint32_t)usec
{
return [[[self alloc] initWithTimeIntervalSinceNow: sec
microseconds: usec] autorelease];
}
+ distantFuture
{
if (sizeof(time_t) == sizeof(int64_t))
return [[[self alloc]
initWithTimeIntervalSince1970: INT64_MAX
microseconds: 999999] autorelease];
if (sizeof(time_t) == sizeof(int32_t))
return [[[self alloc]
initWithTimeIntervalSince1970: INT32_MAX
microseconds: 999999] autorelease];
/* Neither 64 nor 32 bit. But it's guaranteed to be at least an int */
return [[[self alloc]
initWithTimeIntervalSince1970: INT_MAX
microseconds: 999999] autorelease];
}
+ distantPast
{
/* We don't know if time_t is signed or unsigned. Use 0 to be safe */
return [[[self alloc] initWithTimeIntervalSince1970: 0] autorelease];
}
|
| ︙ | ︙ | |||
147 148 149 150 151 152 153 | @throw [OFInitializationFailedException newWithClass: c]; } return [self initWithTimeIntervalSince1970: t.tv_sec microseconds: t.tv_usec]; } | | | | > > > > > > > > > > > > > > > > > > > > > > | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 |
@throw [OFInitializationFailedException newWithClass: c];
}
return [self initWithTimeIntervalSince1970: t.tv_sec
microseconds: t.tv_usec];
}
- initWithTimeIntervalSince1970: (int64_t)sec_
{
return [self initWithTimeIntervalSince1970: sec_
microseconds: 0];
}
- initWithTimeIntervalSince1970: (int64_t)sec_
microseconds: (uint32_t)usec_
{
self = [super init];
sec = sec_;
usec = usec_;
return self;
}
- initWithTimeIntervalSinceNow: (int64_t)sec_
{
return [self initWithTimeIntervalSinceNow: sec_
microseconds: 0];
}
- initWithTimeIntervalSinceNow: (int64_t)sec_
microseconds: (uint32_t)usec_
{
self = [self init];
sec += sec_;
usec += usec_;
while (usec > 999999) {
usec -= 999999;
sec++;
}
return self;
}
- (BOOL)isEqual: (id)obj
{
if (![obj isKindOfClass: [OFDate class]])
|
| ︙ | ︙ | |||
203 204 205 206 207 208 209 |
}
- (OFString*)description
{
return [self dateStringWithFormat: @"%Y-%m-%dT%H:%M:%SZ"];
}
| | | | | | | | | | | | | | | > > > > | | 264 265 266 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 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 |
}
- (OFString*)description
{
return [self dateStringWithFormat: @"%Y-%m-%dT%H:%M:%SZ"];
}
- (uint32_t)microsecond
{
return usec;
}
- (uint8_t)second
{
GMTIME_RET(tm_sec)
}
- (uint8_t)minute
{
GMTIME_RET(tm_min)
}
- (uint8_t)hour
{
GMTIME_RET(tm_hour)
}
- (uint8_t)localHour
{
LOCALTIME_RET(tm_hour)
}
- (uint8_t)dayOfMonth
{
GMTIME_RET(tm_mday)
}
- (uint8_t)localDayOfMonth
{
LOCALTIME_RET(tm_mday)
}
- (uint8_t)monthOfYear
{
GMTIME_RET(tm_mon + 1)
}
- (uint8_t)localMonthOfYear
{
LOCALTIME_RET(tm_mon + 1)
}
- (uint16_t)year
{
GMTIME_RET(tm_year + 1900)
}
- (uint8_t)dayOfWeek
{
GMTIME_RET(tm_wday)
}
- (uint8_t)localDayOfWeek
{
LOCALTIME_RET(tm_wday)
}
- (uint16_t)dayOfYear
{
GMTIME_RET(tm_yday + 1)
}
- (uint16_t)localDayOfYear
{
LOCALTIME_RET(tm_yday + 1)
}
- (OFString*)dateStringWithFormat: (OFString*)fmt
{
time_t sec_ = sec;
struct tm tm;
char *buf;
if (sec != sec_)
@throw [OFOutOfRangeException newWithClass: isa];
#ifdef HAVE_GMTIME_R
if (gmtime_r(&sec_, &tm) == NULL)
@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
[mutex lock];
@try {
# endif
|
| ︙ | ︙ | |||
314 315 316 317 318 319 320 321 322 323 324 |
} @finally {
[self freeMemory: buf];
}
}
- (OFString*)localDateStringWithFormat: (OFString*)fmt
{
struct tm tm;
char *buf;
#ifdef HAVE_LOCALTIME_R
| > > > > | | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 |
} @finally {
[self freeMemory: buf];
}
}
- (OFString*)localDateStringWithFormat: (OFString*)fmt
{
time_t sec_ = sec;
struct tm tm;
char *buf;
if (sec != sec_)
@throw [OFOutOfRangeException newWithClass: isa];
#ifdef HAVE_LOCALTIME_R
if (localtime_r(&sec_, &tm) == NULL)
@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
[mutex lock];
@try {
# endif
|
| ︙ | ︙ | |||
366 367 368 369 370 371 372 373 |
- (OFDate*)laterDate: (OFDate*)date
{
if ([self compare: date] == OF_ORDERED_ASCENDING)
return [[date retain] autorelease];
return [[self retain] autorelease];
}
@end
| > > > > > > > > > > > > > > > > > > > > > | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 |
- (OFDate*)laterDate: (OFDate*)date
{
if ([self compare: date] == OF_ORDERED_ASCENDING)
return [[date retain] autorelease];
return [[self retain] autorelease];
}
- (OFDate*)dateByAddingTimeInterval: (int64_t)sec_
{
return [self dateByAddingTimeInterval: sec_
withMicroseconds: 0];
}
- (OFDate*)dateByAddingTimeInterval: (int64_t)sec_
withMicroseconds: (uint32_t)usec_
{
sec_ += sec;
usec_ += usec;
while (usec_ > 999999) {
usec_ -= 999999;
sec_++;
}
return [OFDate dateWithTimeIntervalSince1970: sec_
microseconds: usec_];
}
@end
|