Overview
Comment: | Make OFList conform to OFCollection and OFFastEnumeration protocol. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2cb79baae47ea3c9777df42033606b60 |
User & Date: | js on 2010-09-06 13:47:45 |
Other Links: | manifest | tags |
Context
2010-09-06
| ||
14:52 | Add a blocks runtime. check-in: 490cbb8e60 user: js tags: trunk | |
13:47 | Make OFList conform to OFCollection and OFFastEnumeration protocol. check-in: 2cb79baae4 user: js tags: trunk | |
2010-09-05
| ||
23:36 | Update Xcode project. check-in: d2c728e2c5 user: js tags: trunk | |
Changes
Modified src/OFList.h from [12c31cb041] to [c32fd13d67].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | /* * Copyright (c) 2008 - 2010 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" /** * \brief A list object. * * A struct that contains a pointer to the next list object, the previous list * object and the object. */ typedef struct __of_list_object { /// A pointer to the next list object in the list struct __of_list_object *next; /// A pointer to the previous list object in the list struct __of_list_object *prev; /// The object for the list object id object; } of_list_object_t; /** * \brief A class which provides easy to use double-linked lists. */ | > > | > < | 1 2 3 4 5 6 7 8 9 10 11 12 13 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 | /* * Copyright (c) 2008 - 2010 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFCollection.h" #import "OFEnumerator.h" /** * \brief A list object. * * A struct that contains a pointer to the next list object, the previous list * object and the object. */ typedef struct __of_list_object { /// A pointer to the next list object in the list struct __of_list_object *next; /// A pointer to the previous list object in the list struct __of_list_object *prev; /// The object for the list object id object; } of_list_object_t; /** * \brief A class which provides easy to use double-linked lists. */ @interface OFList: OFObject <OFCopying, OFCollection, OFFastEnumeration> { of_list_object_t *firstListObject; of_list_object_t *lastListObject; size_t count; unsigned long mutations; } #ifdef OF_HAVE_PROPERTIES @property (readonly) of_list_object_t *firstListObject; @property (readonly) of_list_object_t *lastListObject; #endif /** * \return A new autoreleased OFList */ + list; |
︙ | ︙ | |||
103 104 105 106 107 108 109 110 | /** * Removes the object with the specified list object from the list. * * \param listobj The list object returned by append / prepend */ - (void)removeListObject: (of_list_object_t*)listobj; | > | > > | > > > > | < > > > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | /** * Removes the object with the specified list object from the list. * * \param listobj The list object returned by append / prepend */ - (void)removeListObject: (of_list_object_t*)listobj; @end /// \cond internal @interface OFListEnumerator: OFEnumerator { of_list_object_t *first; of_list_object_t *current; unsigned long mutations; unsigned long *mutationsPtr; } - initWithFirstListObject: (of_list_object_t*)first mutationsPointer: (unsigned long*)mutations_ptr; @end /// \endcond |
Modified src/OFList.m from [156d215610] to [79d7008d03].
︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 | lastListObject->next = o; lastListObject = o; if (firstListObject == NULL) firstListObject = o; count++; [obj retain]; return o; } - (of_list_object_t*)prependObject: (id)obj | > | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | lastListObject->next = o; lastListObject = o; if (firstListObject == NULL) firstListObject = o; count++; mutations++; [obj retain]; return o; } - (of_list_object_t*)prependObject: (id)obj |
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 102 | firstListObject->prev = o; firstListObject = o; if (lastListObject == NULL) lastListObject = o; count++; [obj retain]; return o; } - (of_list_object_t*)insertObject: (id)obj | > | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | firstListObject->prev = o; firstListObject = o; if (lastListObject == NULL) lastListObject = o; count++; mutations++; [obj retain]; return o; } - (of_list_object_t*)insertObject: (id)obj |
︙ | ︙ | |||
114 115 116 117 118 119 120 121 122 123 124 125 126 127 | listobj->prev = o; if (listobj == firstListObject) firstListObject = o; count++; [obj retain]; return o; } - (of_list_object_t*)insertObject: (id)obj | > | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | listobj->prev = o; if (listobj == firstListObject) firstListObject = o; count++; mutations++; [obj retain]; return o; } - (of_list_object_t*)insertObject: (id)obj |
︙ | ︙ | |||
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 | listobj->next = o; if (listobj == lastListObject) lastListObject = o; count++; [obj retain]; return o; } - (void)removeListObject: (of_list_object_t*)listobj { if (listobj->prev != NULL) listobj->prev->next = listobj->next; if (listobj->next != NULL) listobj->next->prev = listobj->prev; if (firstListObject == listobj) firstListObject = listobj->next; if (lastListObject == listobj) lastListObject = listobj->prev; count--; [listobj->object release]; [self freeMemory: listobj]; } - (size_t)count | > > | 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 | listobj->next = o; if (listobj == lastListObject) lastListObject = o; count++; mutations++; [obj retain]; return o; } - (void)removeListObject: (of_list_object_t*)listobj { if (listobj->prev != NULL) listobj->prev->next = listobj->next; if (listobj->next != NULL) listobj->next->prev = listobj->prev; if (firstListObject == listobj) firstListObject = listobj->next; if (lastListObject == listobj) lastListObject = listobj->prev; count--; mutations++; [listobj->object release]; [self freeMemory: listobj]; } - (size_t)count |
︙ | ︙ | |||
247 248 249 250 251 252 253 254 | OF_HASH_ADD(hash, h & 0xFF); } OF_HASH_FINALIZE(hash); return hash; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 | OF_HASH_ADD(hash, h & 0xFF); } OF_HASH_FINALIZE(hash); return hash; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count_ { of_list_object_t **list_obj = (of_list_object_t**)state->extra; state->itemsPtr = objects; state->mutationsPtr = &mutations; if (state->state == 0) { *list_obj = firstListObject; state->state = 1; } if (*list_obj == NULL) return 0; objects[0] = (*list_obj)->object; *list_obj = (*list_obj)->next; return 1; } - (OFEnumerator*)objectEnumerator { return [[[OFListEnumerator alloc] initWithFirstListObject: firstListObject mutationsPointer: &mutations] autorelease]; } @end /// \cond internal @implementation OFListEnumerator - initWithFirstListObject: (of_list_object_t*)first_ mutationsPointer: (unsigned long*)mutationsPtr_; { self = [super init]; first = first_; current = first_; mutations = *mutationsPtr_; mutationsPtr = mutationsPtr_; return self; } - (id)nextObject { id ret; if (*mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa]; if (current == NULL) return nil; ret = current->object; current = current->next; return ret; } - (void)reset { if (*mutationsPtr != mutations) @throw [OFEnumerationMutationException newWithClass: isa]; current = first; } @end /// \endcond |
Modified tests/OFArrayTests.m from [8f3081b30f] to [415ab0ae8e].
︙ | ︙ | |||
138 139 140 141 142 143 144 145 146 147 148 149 150 151 | while ((obj = [enumerator nextObject]) != nil) { if (![obj isEqual: c_ary[i]]) ok = NO; [m[0] replaceObjectAtIndex: i withObject: @""]; i++; } TEST(@"OFEnumerator's -[nextObject]", ok) [enumerator reset]; [m[0] removeObjectAtIndex: 0]; EXPECT_EXCEPTION(@"Detection of mutation during enumeration", | > > > | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | while ((obj = [enumerator nextObject]) != nil) { if (![obj isEqual: c_ary[i]]) ok = NO; [m[0] replaceObjectAtIndex: i withObject: @""]; i++; } if ([m[0] count] != i) ok = NO; TEST(@"OFEnumerator's -[nextObject]", ok) [enumerator reset]; [m[0] removeObjectAtIndex: 0]; EXPECT_EXCEPTION(@"Detection of mutation during enumeration", |
︙ | ︙ | |||
159 160 161 162 163 164 165 166 167 168 169 170 171 172 | for (OFString *s in m[0]) { if (![s isEqual: c_ary[i]]) ok = NO; [m[0] replaceObjectAtIndex: i withObject: @""]; i++; } TEST(@"Fast Enumeration", ok) [m[0] replaceObjectAtIndex: 0 withObject: c_ary[0]]; [m[0] replaceObjectAtIndex: 1 withObject: c_ary[1]]; | > > > | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | for (OFString *s in m[0]) { if (![s isEqual: c_ary[i]]) ok = NO; [m[0] replaceObjectAtIndex: i withObject: @""]; i++; } if ([m[0] count] != i) ok = NO; TEST(@"Fast Enumeration", ok) [m[0] replaceObjectAtIndex: 0 withObject: c_ary[0]]; [m[0] replaceObjectAtIndex: 1 withObject: c_ary[1]]; |
︙ | ︙ |
Modified tests/OFListTests.m from [9238e3734a] to [fb3fe334cc].
︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 | }; @implementation TestsAppDelegate (OFListTests) - (void)listTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFList *list; TEST(@"+[list]", (list = [OFList list])) TEST(@"-[appendObject:]", [list appendObject: strings[0]] && [list appendObject: strings[1]] && [list appendObject: strings[2]]) TEST(@"-[firstListObject]", | > > > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | }; @implementation TestsAppDelegate (OFListTests) - (void)listTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFList *list; OFEnumerator *enumerator; of_list_object_t *loe; OFString *obj; size_t i; BOOL ok; TEST(@"+[list]", (list = [OFList list])) TEST(@"-[appendObject:]", [list appendObject: strings[0]] && [list appendObject: strings[1]] && [list appendObject: strings[2]]) TEST(@"-[firstListObject]", |
︙ | ︙ | |||
56 57 58 59 60 61 62 | [list lastListObject]->object]) TEST(@"-[insertObject:beforeListObject:]", [list insertObject: strings[0] beforeListObject: [list lastListObject]] && [[list lastListObject]->prev->object isEqual: strings[0]]) | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | [list lastListObject]->object]) TEST(@"-[insertObject:beforeListObject:]", [list insertObject: strings[0] beforeListObject: [list lastListObject]] && [[list lastListObject]->prev->object isEqual: strings[0]]) TEST(@"-[insertObject:afterListObject:]", [list insertObject: strings[2] afterListObject: [list firstListObject]->next] && [[list lastListObject]->object isEqual: strings[2]]) TEST(@"-[count]", [list count] == 3) TEST(@"-[copy]", (list = [[list copy] autorelease]) && [[list firstListObject]->object isEqual: strings[0]] && [[list firstListObject]->next->object isEqual: strings[1]] && [[list lastListObject]->object isEqual: strings[2]]) TEST(@"-[isEqual:]", [list isEqual: [[list copy] autorelease]]) TEST(@"-[objectEnumerator]", (enumerator = [list objectEnumerator])) loe = [list firstListObject]; i = 0; ok = YES; while ((obj = [enumerator nextObject]) != nil) { if (![obj isEqual: loe->object]) ok = NO; loe = loe->next; i++; } if ([list count] != i) ok = NO; TEST(@"OFEnumerator's -[nextObject]", ok); [enumerator reset]; [list removeListObject: [list firstListObject]]; EXPECT_EXCEPTION(@"Detection of mutation during enumeration", OFEnumerationMutationException, [enumerator nextObject]) [list prependObject: strings[0]]; #ifdef OF_HAVE_FAST_ENUMERATION loe = [list firstListObject]; i = 0; ok = YES; for (OFString *obj in list) { if (![obj isEqual: loe->object]) ok = NO; loe = loe->next; i++; } if ([list count] != i) ok = NO; TEST(@"Fast Enumeration", ok) ok = NO; @try { for (OFString *obj in list) [list removeListObject: [list lastListObject]]; } @catch (OFEnumerationMutationException *e) { ok = YES; [e dealloc]; } TEST(@"Detection of mutation during Fast Enumeration", ok) #endif [pool drain]; } @end |