Overview
Comment: | Style improvements in OFDate. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8c349fdf52c4206f72790154f9cefb05 |
User & Date: | js on 2011-04-22 15:48:12 |
Other Links: | manifest | tags |
Context
2011-04-22
| ||
16:23 | Various style improvements. check-in: c7e66feb30 user: js tags: trunk | |
15:48 | Style improvements in OFDate. check-in: 8c349fdf52 user: js tags: trunk | |
15:00 | OFHTTPRequest: Fix missing release of delegate. check-in: 838246b066 user: js tags: trunk | |
Changes
Modified src/OFDate.h from [4848b2e679] to [94535e3a6e].
︙ | ︙ | |||
19 20 21 22 23 24 25 | @class OFString; /** * \brief A class for storing, accessing and comparing dates. */ @interface OFDate: OFObject <OFCopying, OFComparing> { | | | | | | | | | | | | | | | | | | | | | | < | | | | | | | 19 20 21 22 23 24 25 26 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 118 119 120 121 122 123 124 125 126 | @class OFString; /** * \brief A class for storing, accessing and comparing dates. */ @interface OFDate: OFObject <OFCopying, OFComparing> { int64_t seconds; uint32_t microseconds; } /** * \return A new, autoreleased OFDate with the current date and time */ + date; /** * \param seconds The seconds since 1970-01-01T00:00:00Z * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSince1970: (int64_t)seconds; /** * \param seconds The seconds since 1970-01-01T00:00:00Z * \param microseconds The microsecond part of the time * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSince1970: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * \param seconds The seconds since now * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSinceNow: (int64_t)seconds; /** * \param seconds The seconds since now * \param microseconds The microsecond part of the time * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * Returns a date in the distant future. The date is system-dependant. * * \return A date in the distant future */ + distantFuture; /** * Returns a date in the distant past. The date is system-dependant. * * \return A date in the distant past */ + distantPast; /** * Initializes an already allocated OFDate with the specified date and time. * * \param seconds The seconds since 1970-01-01T00:00:00Z * \return An initialized OFDate with the specified date and time */ - initWithTimeIntervalSince1970: (int64_t)seconds; /** * Initializes an already allocated OFDate with the specified date and time. * * \param seconds The seconds since 1970-01-01T00:00:00Z * \param microseconds The microsecond part of the time * \return An initialized OFDate with the specified date and time */ - initWithTimeIntervalSince1970: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * Initializes an already allocated OFDate with the specified date and time. * * \param seconds The seconds since now * \return A new, autoreleased OFDate with the specified date and time */ - initWithTimeIntervalSinceNow: (int64_t)seconds; /** * Initializes an already allocated OFDate with the specified date and time. * * \param seconds The seconds since now * \param microseconds The microsecond part of the time * \return A new, autoreleased OFDate with the specified date and time */ - initWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * \return The microsecond of the date */ - (uint32_t)microsecond; /** * \return The second of the date */ - (uint8_t)second; /** * \return The minute of the date */ - (uint8_t)minute; |
︙ | ︙ | |||
201 202 203 204 205 206 207 | */ - (OFString*)localDateStringWithFormat: (OFString*)fmt; /** * \param date Another date * \return The earlier date of the two dates */ | | | | | | | | | | | | 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 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | */ - (OFString*)localDateStringWithFormat: (OFString*)fmt; /** * \param date Another date * \return The earlier date of the two dates */ - (OFDate*)earlierDate: (OFDate*)otherDate; /** * \param date Another date * \return The later date of the two dates */ - (OFDate*)laterDate: (OFDate*)otherDate; /** * \return The seconds since 1970-01-01T00:00:00Z */ - (int64_t)timeIntervalSince1970; /** * \return The microseconds part of the seconds since 1970-01-01T00:00:00Z */ - (uint32_t)microsecondsOfTimeIntervalSince1970; /** * \return The seconds the receiver is after the date. */ - (int64_t)timeIntervalSinceDate: (OFDate*)otherDate; /** * \return The microseconds part of the seconds the receiver is after the date */ - (uint32_t)microsecondsOfTimeIntervalSinceDate: (OFDate*)otherDate; /** * Returns a new date with the specified time interval added. * * \param seconds The seconds after the date * \return A new, autoreleased OFDate */ - (OFDate*)dateByAddingTimeInterval: (int64_t)seconds; /** * Returns a new date with the specified time interval added. * * \param seconds The seconds after the date * \param microseconds The microseconds after the date * \return A new, autoreleased OFDate */ - (OFDate*)dateByAddingTimeInterval: (int64_t)seconds withMicroseconds: (uint32_t)microseconds; @end |
Modified src/OFDate.m from [d33bbd220e] to [97a4e4b983].
︙ | ︙ | |||
36 37 38 39 40 41 42 | #if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \ defined(OF_THREADS) static OFMutex *mutex; #endif #ifdef HAVE_GMTIME_R # define GMTIME_RET(field) \ | | | | | | | | | | | | | | | | | | | 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 118 119 120 121 122 123 124 125 126 | #if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \ defined(OF_THREADS) static OFMutex *mutex; #endif #ifdef HAVE_GMTIME_R # define GMTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm tm; \ \ if (seconds != seconds_) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if (gmtime_r(&seconds_, &tm) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm.field; # define LOCALTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm tm; \ \ if (seconds != seconds_) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if (localtime_r(&seconds_, &tm) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm.field; #else # ifdef OF_THREADS # define GMTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds != seconds_) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ [mutex lock]; \ \ @try { \ if ((tm = gmtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; \ } @finally { \ [mutex unlock]; \ } # define LOCALTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds != seconds_) \ @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 seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds != seconds_) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if ((tm = gmtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; # define LOCALTIME_RET(field) \ time_t seconds_ = (time_t)seconds; \ struct tm *tm; \ \ if (seconds != seconds_) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ if ((tm = localtime(&seconds_)) == NULL) \ @throw [OFOutOfRangeException newWithClass: isa]; \ \ return tm->field; # endif #endif @implementation OFDate |
︙ | ︙ | |||
134 135 136 137 138 139 140 | #endif + date { return [[[self alloc] init] autorelease]; } | | | > | | | > | | | > | | | > | | 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 | #endif + date { return [[[self alloc] init] autorelease]; } + dateWithTimeIntervalSince1970: (int64_t)seconds { return [[[self alloc] initWithTimeIntervalSince1970: seconds] autorelease]; } + dateWithTimeIntervalSince1970: (int64_t)seconds microseconds: (uint32_t)microseconds { return [[[self alloc] initWithTimeIntervalSince1970: seconds microseconds: microseconds] autorelease]; } + dateWithTimeIntervalSinceNow: (int64_t)seconds { return [[[self alloc] initWithTimeIntervalSinceNow: seconds] autorelease]; } + dateWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds { return [[[self alloc] initWithTimeIntervalSinceNow: seconds microseconds: microseconds] autorelease]; } + distantFuture { if (sizeof(time_t) == sizeof(int64_t)) return [[[self alloc] initWithTimeIntervalSince1970: INT64_MAX |
︙ | ︙ | |||
195 196 197 198 199 200 201 | @throw [OFInitializationFailedException newWithClass: c]; } return [self initWithTimeIntervalSince1970: t.tv_sec microseconds: (uint32_t)t.tv_usec]; } | | | | | | | | | | | | | | | < < > > | > > > > > > | > > | | | | | 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 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 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 | @throw [OFInitializationFailedException newWithClass: c]; } return [self initWithTimeIntervalSince1970: t.tv_sec microseconds: (uint32_t)t.tv_usec]; } - initWithTimeIntervalSince1970: (int64_t)seconds_ { return [self initWithTimeIntervalSince1970: seconds_ microseconds: 0]; } - initWithTimeIntervalSince1970: (int64_t)seconds_ microseconds: (uint32_t)microseconds_ { self = [super init]; seconds = seconds_; microseconds = microseconds_; return self; } - initWithTimeIntervalSinceNow: (int64_t)seconds_ { return [self initWithTimeIntervalSinceNow: seconds_ microseconds: 0]; } - initWithTimeIntervalSinceNow: (int64_t)seconds_ microseconds: (uint32_t)microseconds_ { self = [self init]; seconds += seconds_; microseconds += microseconds_; seconds += microseconds / 1000000; microseconds %= 1000000; return self; } - (BOOL)isEqual: (id)obj { OFDate *otherDate; if (![obj isKindOfClass: [OFDate class]]) return NO; otherDate = (OFDate*)obj; if (otherDate->seconds != seconds || otherDate->microseconds != microseconds) return NO; return YES; } - copy { return [self retain]; } - (of_comparison_result_t)compare: (id)obj { OFDate *otherDate; if (![obj isKindOfClass: [OFDate class]]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; otherDate = (OFDate*)obj; if (seconds < otherDate->seconds) return OF_ORDERED_ASCENDING; if (seconds > otherDate->seconds) return OF_ORDERED_DESCENDING; if (microseconds < otherDate->microseconds) return OF_ORDERED_ASCENDING; if (microseconds > otherDate->microseconds) return OF_ORDERED_DESCENDING; return OF_ORDERED_SAME; } - (OFString*)description { return [self dateStringWithFormat: @"%Y-%m-%dT%H:%M:%SZ"]; } - (uint32_t)microsecond { return microseconds; } - (uint8_t)second { GMTIME_RET(tm_sec) } |
︙ | ︙ | |||
346 347 348 349 350 351 352 | { LOCALTIME_RET(tm_yday + 1) } - (OFString*)dateStringWithFormat: (OFString*)fmt { OFString *ret; | | | | | | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | { LOCALTIME_RET(tm_yday + 1) } - (OFString*)dateStringWithFormat: (OFString*)fmt { OFString *ret; time_t seconds_ = (time_t)seconds; struct tm tm; char *buf; if (seconds != seconds_) @throw [OFOutOfRangeException newWithClass: isa]; #ifdef HAVE_GMTIME_R if (gmtime_r(&seconds_, &tm) == NULL) @throw [OFOutOfRangeException newWithClass: isa]; #else # ifdef OF_THREADS [mutex lock]; @try { # endif struct tm *tmp; if ((tmp = gmtime(&seconds_)) == NULL) @throw [OFOutOfRangeException newWithClass: isa]; tm = *tmp; # ifdef OF_THREADS } @finally { [mutex unlock]; } |
︙ | ︙ | |||
392 393 394 395 396 397 398 | return ret; } - (OFString*)localDateStringWithFormat: (OFString*)fmt { OFString *ret; | | | | | | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | return ret; } - (OFString*)localDateStringWithFormat: (OFString*)fmt { OFString *ret; time_t seconds_ = (time_t)seconds; struct tm tm; char *buf; if (seconds != seconds_) @throw [OFOutOfRangeException newWithClass: isa]; #ifdef HAVE_LOCALTIME_R if (localtime_r(&seconds_, &tm) == NULL) @throw [OFOutOfRangeException newWithClass: isa]; #else # ifdef OF_THREADS [mutex lock]; @try { # endif struct tm *tmp; if ((tmp = localtime(&seconds_)) == NULL) @throw [OFOutOfRangeException newWithClass: isa]; tm = *tmp; # ifdef OF_THREADS } @finally { [mutex unlock]; } |
︙ | ︙ | |||
435 436 437 438 439 440 441 | } @finally { [self freeMemory: buf]; } return ret; } | | | | | | | | | | | | | | < | | < | | | | | < | | | | | | | | | | < | < | | | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | } @finally { [self freeMemory: buf]; } return ret; } - (OFDate*)earlierDate: (OFDate*)otherDate { if ([self compare: otherDate] == OF_ORDERED_DESCENDING) return [[otherDate retain] autorelease]; return [[self retain] autorelease]; } - (OFDate*)laterDate: (OFDate*)otherDate { if ([self compare: otherDate] == OF_ORDERED_ASCENDING) return [[otherDate retain] autorelease]; return [[self retain] autorelease]; } - (int64_t)timeIntervalSince1970 { return seconds; } - (uint32_t)microsecondsOfTimeIntervalSince1970 { return microseconds; } - (int64_t)timeIntervalSinceDate: (OFDate*)otherDate { int64_t seconds_ = seconds - otherDate->seconds; int32_t microseconds_ = (int32_t)microseconds - otherDate->microseconds; seconds_ += microseconds_ / 1000000; microseconds_ %= 1000000; while (microseconds_ < 0) { microseconds_ += 1000000; seconds_--; } return seconds_; } - (uint32_t)microsecondsOfTimeIntervalSinceDate: (OFDate*)otherDate { int32_t microseconds_ = (int32_t)microseconds - otherDate->microseconds; microseconds_ %= 1000000; while (microseconds_ < 0) microseconds_ += 1000000; return microseconds_; } - (OFDate*)dateByAddingTimeInterval: (int64_t)sec_ { return [self dateByAddingTimeInterval: sec_ withMicroseconds: 0]; } - (OFDate*)dateByAddingTimeInterval: (int64_t)seconds_ withMicroseconds: (uint32_t)microseconds_ { seconds_ += seconds; microseconds_ += microseconds; seconds_ += microseconds_ / 1000000; microseconds_ %= 1000000; return [OFDate dateWithTimeIntervalSince1970: seconds_ microseconds: microseconds_]; } @end |
Modified tests/OFDateTests.m from [24a93fc13e] to [715110430e].
︙ | ︙ | |||
30 31 32 33 34 35 36 | OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDate *d1, *d2; TEST(@"+[dateWithTimeIntervalSince1970:]", (d1 = [OFDate dateWithTimeIntervalSince1970: 0])) TEST(@"+[dateWithTimeIntervalSince1970:microseconds:]", | | | | | 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 | OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFDate *d1, *d2; TEST(@"+[dateWithTimeIntervalSince1970:]", (d1 = [OFDate dateWithTimeIntervalSince1970: 0])) TEST(@"+[dateWithTimeIntervalSince1970:microseconds:]", (d2 = [d1 dateByAddingTimeInterval: 3600 * 25 + 5 withMicroseconds: 1])) TEST(@"-[description]", [[d1 description] isEqual: @"1970-01-01T00:00:00Z"] && [[d2 description] isEqual: @"1970-01-02T01:00:05Z"]) TEST(@"-[isEqual:]", [d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0]] && ![d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0 microseconds: 1]]) TEST(@"-[compare:]", [d1 compare: d2] == OF_ORDERED_ASCENDING) TEST(@"-[second]", [d1 second] == 0 && [d2 second] == 5) TEST(@"-[microsecond]", [d1 microsecond] == 0 && [d2 microsecond] == 1) TEST(@"-[minute]", [d1 minute] == 0 && [d2 minute] == 0) TEST(@"-[hour]", [d1 hour] == 0 && [d2 hour] == 1) |
︙ | ︙ |