Overview
Comment: | Pass the causing object for OFEnumerationMutationExceptions. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
f072e1a33819547900dcebdebcb30ba7 |
User & Date: | js on 2011-03-27 17:51:45 |
Other Links: | manifest | tags |
Context
2011-03-27
| ||
18:07 | Add +[currentDirectoryPath] to OFFile. check-in: ad8c9974bc user: js tags: trunk | |
17:51 | Pass the causing object for OFEnumerationMutationExceptions. check-in: f072e1a338 user: js tags: trunk | |
17:17 | Add src/exceptions to Doxyfile. check-in: 6d7bdcfc21 user: js tags: trunk | |
Changes
Modified src/OFArray.h from [cdbef7934d] to [463e7000aa].
︙ | ︙ | |||
250 251 252 253 254 255 256 | */ - (OFArray*)filteredArrayUsingBlock: (of_array_filter_block_t)block; #endif @end @interface OFArrayEnumerator: OFEnumerator { | > | > | | | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | */ - (OFArray*)filteredArrayUsingBlock: (of_array_filter_block_t)block; #endif @end @interface OFArrayEnumerator: OFEnumerator { OFArray *array; OFDataArray *dataArray; size_t count; unsigned long mutations; unsigned long *mutationsPtr; size_t pos; } - initWithArray: (OFArray*)data dataArray: (OFDataArray*)dataArray mutationsPointer: (unsigned long*)mutationsPtr; @end #import "OFMutableArray.h" |
Modified src/OFArray.m from [b3651305f9] to [25e8cbc1c1].
︙ | ︙ | |||
457 458 459 460 461 462 463 | state->mutationsPtr = (unsigned long*)self; return (int)count; } - (OFEnumerator*)objectEnumerator { | | | | | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | state->mutationsPtr = (unsigned long*)self; return (int)count; } - (OFEnumerator*)objectEnumerator { return [[[OFArrayEnumerator alloc] initWithArray: self dataArray: array mutationsPointer: NULL] autorelease]; } #ifdef OF_HAVE_BLOCKS - (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; id *objs = [array cArray]; |
︙ | ︙ | |||
554 555 556 557 558 559 560 | [array release]; [super dealloc]; } @end @implementation OFArrayEnumerator | > | | | > | > > > > > > > > | > | | > | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 | [array release]; [super dealloc]; } @end @implementation OFArrayEnumerator - initWithArray: (OFArray*)array_ dataArray: (OFDataArray*)dataArray_ mutationsPointer: (unsigned long*)mutationsPtr_; { self = [super init]; array = [array_ retain]; dataArray = [dataArray_ retain]; count = [dataArray count]; mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0); mutationsPtr = mutationsPtr_; return self; } - (void)dealloc { [array release]; [dataArray release]; [super dealloc]; } - (id)nextObject { if (mutationsPtr != NULL && *mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa object: array]; if (pos < count) return *(id*)[dataArray itemAtIndex: pos++]; return nil; } - (void)reset { if (mutationsPtr != NULL && *mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa object: array]; pos = 0; } @end |
Modified src/OFDictionary.h from [6931285817] to [ec25f9d317].
︙ | ︙ | |||
191 192 193 194 195 196 197 198 199 200 201 202 203 204 | - (OFDictionary*)filteredDictionaryUsingBlock: (of_dictionary_filter_block_t)block; #endif @end @interface OFDictionaryEnumerator: OFEnumerator { struct of_dictionary_bucket **data; uint32_t size; unsigned long mutations; unsigned long *mutationsPtr; uint32_t pos; } | > > | | | | 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 | - (OFDictionary*)filteredDictionaryUsingBlock: (of_dictionary_filter_block_t)block; #endif @end @interface OFDictionaryEnumerator: OFEnumerator { OFDictionary *dictionary; struct of_dictionary_bucket **data; uint32_t size; unsigned long mutations; unsigned long *mutationsPtr; uint32_t pos; } - initWithDictionary: (OFDictionary*)dictionary data: (struct of_dictionary_bucket**)data size: (uint32_t)size mutationsPointer: (unsigned long*)mutationsPtr; @end @interface OFDictionaryObjectEnumerator: OFDictionaryEnumerator @end @interface OFDictionaryKeyEnumerator: OFDictionaryEnumerator @end |
︙ | ︙ |
Modified src/OFDictionary.m from [57e1719683] to [ec5929dd0a].
︙ | ︙ | |||
583 584 585 586 587 588 589 | return i; } - (OFEnumerator*)objectEnumerator { return [[[OFDictionaryObjectEnumerator alloc] | > | | | > | | | | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 | return i; } - (OFEnumerator*)objectEnumerator { return [[[OFDictionaryObjectEnumerator alloc] initWithDictionary: self data: data size: size mutationsPointer: NULL] autorelease]; } - (OFEnumerator*)keyEnumerator { return [[[OFDictionaryKeyEnumerator alloc] initWithDictionary: self data: data size: size mutationsPointer: NULL] autorelease]; } #ifdef OF_HAVE_BLOCKS - (void)enumerateKeysAndObjectsUsingBlock: (of_dictionary_enumeration_block_t)block { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; |
︙ | ︙ | |||
733 734 735 736 737 738 739 | */ ret->isa = [OFString class]; return ret; } @end @implementation OFDictionaryEnumerator | > | | | > > > > > > > > | > > | > > | > > | 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 | */ ret->isa = [OFString class]; return ret; } @end @implementation OFDictionaryEnumerator - initWithDictionary: (OFDictionary*)dictionary_ data: (struct of_dictionary_bucket**)data_ size: (uint32_t)size_ mutationsPointer: (unsigned long*)mutationsPtr_ { self = [super init]; dictionary = [dictionary_ retain]; data = data_; size = size_; mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0); mutationsPtr = mutationsPtr_; return self; } - (void)dealloc { [dictionary release]; [super dealloc]; } - (void)reset { if (mutationsPtr != NULL && *mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa object: dictionary]; pos = 0; } @end @implementation OFDictionaryObjectEnumerator - (id)nextObject { if (mutationsPtr != NULL && *mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa object: dictionary]; for (; pos < size && (data[pos] == NULL || data[pos] == DELETED); pos++); if (pos < size) return data[pos++]->object; else return nil; } @end @implementation OFDictionaryKeyEnumerator - (id)nextObject { if (mutationsPtr != NULL && *mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa object: dictionary]; for (; pos < size && (data[pos] == NULL || data[pos] == DELETED); pos++); if (pos < size) return data[pos++]->key; else return nil; } @end |
Modified src/OFList.h from [5d36c42d1f] to [3cd365a47f].
︙ | ︙ | |||
115 116 117 118 119 120 121 | * \param listobj The list object returned by append / prepend */ - (void)removeListObject: (of_list_object_t*)listobj; @end @interface OFListEnumerator: OFEnumerator { | | | | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | * \param listobj The list object returned by append / prepend */ - (void)removeListObject: (of_list_object_t*)listobj; @end @interface OFListEnumerator: OFEnumerator { OFList *list; of_list_object_t *current; unsigned long mutations; unsigned long *mutationsPtr; } - initWithList: (OFList*)list mutationsPointer: (unsigned long*)mutationsPtr; @end |
Modified src/OFList.m from [414dcbec8b] to [988739eca9].
︙ | ︙ | |||
345 346 347 348 349 350 351 | *list_obj = (*list_obj)->next; return 1; } - (OFEnumerator*)objectEnumerator { return [[[OFListEnumerator alloc] | | | | | | | > > > > > > > | > | | 345 346 347 348 349 350 351 352 353 354 355 356 357 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 391 392 393 394 395 396 397 398 399 400 401 402 | *list_obj = (*list_obj)->next; return 1; } - (OFEnumerator*)objectEnumerator { return [[[OFListEnumerator alloc] initWithList: self mutationsPointer: &mutations] autorelease]; } @end @implementation OFListEnumerator - initWithList: (OFList*)list_ mutationsPointer: (unsigned long*)mutationsPtr_; { self = [super init]; list = [list_ retain]; current = [list firstListObject]; mutations = *mutationsPtr_; mutationsPtr = mutationsPtr_; return self; } - (void)dealloc { [list release]; [super dealloc]; } - (id)nextObject { id ret; if (*mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa object: list]; if (current == NULL) return nil; ret = current->object; current = current->next; return ret; } - (void)reset { if (*mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa]; current = [list firstListObject]; } @end |
Modified src/OFMutableArray.m from [1b4f2b6197] to [d3e5b8eedf].
︙ | ︙ | |||
222 223 224 225 226 227 228 | return (int)count; } - (OFEnumerator*)objectEnumerator { return [[[OFArrayEnumerator alloc] | > | | | > | > | 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 | return (int)count; } - (OFEnumerator*)objectEnumerator { return [[[OFArrayEnumerator alloc] initWithArray: self dataArray: array mutationsPointer: &mutations] autorelease]; } #ifdef OF_HAVE_BLOCKS - (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; id *objs = [array cArray]; size_t i, count = [array count]; BOOL stop = NO; unsigned long mutations2 = mutations; for (i = 0; i < count && !stop; i++) { if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa object: self]; block(objs[i], i, &stop); [pool releaseObjects]; } [pool release]; } - (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; id *objs = [array cArray]; size_t i, count = [array count]; BOOL stop = NO; unsigned long mutations2 = mutations; for (i = 0; i < count && !stop; i++) { if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa object: self]; id new = block(objs[i], i, &stop); if (new == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; |
︙ | ︙ |
Modified src/OFMutableDictionary.m from [c62c6b1356] to [2759ebe7dd].
︙ | ︙ | |||
258 259 260 261 262 263 264 | return i; } - (OFEnumerator*)objectEnumerator { return [[[OFDictionaryObjectEnumerator alloc] | > | | | > | | | | > | > | 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 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 | return i; } - (OFEnumerator*)objectEnumerator { return [[[OFDictionaryObjectEnumerator alloc] initWithDictionary: self data: data size: size mutationsPointer: &mutations] autorelease]; } - (OFEnumerator*)keyEnumerator { return [[[OFDictionaryKeyEnumerator alloc] initWithDictionary: self data: data size: size mutationsPointer: &mutations] autorelease]; } #ifdef OF_HAVE_BLOCKS - (void)enumerateKeysAndObjectsUsingBlock: (of_dictionary_enumeration_block_t)block { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; size_t i; BOOL stop = NO; unsigned long mutations2 = mutations; for (i = 0; i < size && !stop; i++) { if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa object: self]; if (data[i] != NULL && data[i] != DELETED) { block(data[i]->key, data[i]->object, &stop); [pool releaseObjects]; } } [pool release]; } - (void)replaceObjectsUsingBlock: (of_dictionary_replace_block_t)block { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; size_t i; BOOL stop = NO; unsigned long mutations2 = mutations; for (i = 0; i < size && !stop; i++) { if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa object: self]; if (data[i] != NULL && data[i] != DELETED) { id new = block(data[i]->key, data[i]->object, &stop); if (new == nil) @throw [OFInvalidArgumentException newWithClass: isa |
︙ | ︙ |
Modified src/OFObject.m from [fc3fc31d4e] to [8f8e235cfd].
︙ | ︙ | |||
95 96 97 98 99 100 101 | #ifdef NEED_OBJC_PROPERTIES_INIT extern BOOL objc_properties_init(); #endif static void enumeration_mutation_handler(id obj) { | | > | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | #ifdef NEED_OBJC_PROPERTIES_INIT extern BOOL objc_properties_init(); #endif static void enumeration_mutation_handler(id obj) { @throw [OFEnumerationMutationException newWithClass: [obj class] object: obj]; } #ifndef HAVE_OBJC_ENUMERATIONMUTATION void objc_enumerationMutation(id obj) { enumeration_mutation_handler(obj); |
︙ | ︙ |
Modified src/exceptions/OFEnumerationMutationException.h from [1b3795fa98] to [455af96c9c].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 | #import "OFException.h" /** * \brief An exception indicating that a mutation was detected during * enumeration. */ @interface OFEnumerationMutationException: OFException @end | > > > > > > > > > > > > > > > > > > > > > > > > > > | 17 18 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 | #import "OFException.h" /** * \brief An exception indicating that a mutation was detected during * enumeration. */ @interface OFEnumerationMutationException: OFException { id object; } /** * \param class_ The class of the object which caused the exception * \param object The object which was mutated during enumeration * \return A new enumeration mutation exception */ + newWithClass: (Class)class_ object: (id)object; /** * Initializes an already allocated enumeration mutation exception. * * \param class_ The class of the object which caused the exception * \param object The object which was mutated during enumeration * \return An initialized enumeration mutation exception */ - initWithClass: (Class)class_ object: (id)object; /** * \return The object which was mutated during enumeration */ - (id)object; @end |
Modified src/exceptions/OFEnumerationMutationException.m from [3e8276684b] to [acf0fdeae1].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | * file. */ #include "config.h" #import "OFEnumerationMutationException.h" #import "OFString.h" @implementation OFEnumerationMutationException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Object of class %@ was mutated during enumeration!", inClass]; return description; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 14 15 16 17 18 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 | * file. */ #include "config.h" #import "OFEnumerationMutationException.h" #import "OFString.h" #import "OFNotImplementedException.h" @implementation OFEnumerationMutationException + newWithClass: (Class)class_ object: (id)object { return [[self alloc] initWithClass: class_ object: object]; } - initWithClass: (Class)class_ { Class c = isa; [self release]; @throw [OFNotImplementedException newWithClass: c selector: _cmd]; } - initWithClass: (Class)class_ object: (id)object_ { self = [super initWithClass: class_]; @try { object = [object_ retain]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [object release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Object of class %@ was mutated during enumeration!", inClass]; return description; } - (id)object { return object; } @end |