Overview
Comment: | More methods for OFArray and OFMutableArray. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
72efa4f4f3ffb062f2a899e6651f6bb3 |
User & Date: | js on 2012-01-08 02:03:03 |
Other Links: | manifest | tags |
Context
2012-01-24
| ||
11:57 | Compare pointers of strings before comparing the string content. check-in: af56ce47e0 user: js tags: trunk | |
2012-01-08
| ||
02:03 | More methods for OFArray and OFMutableArray. check-in: 72efa4f4f3 user: js tags: trunk | |
2012-01-05
| ||
21:07 | Oops, forgot to remove them. check-in: fc065f0506 user: js tags: trunk | |
Changes
Modified src/OFArray.h from [aa7c60fb4e] to [67421fc5d9].
︙ | |||
258 259 260 261 262 263 264 265 266 267 268 269 270 271 | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | + + + + + + + | * \param selector The selector to perform on all objects in the array * \param object The object to perform the selector with on all objects in the * array */ - (void)makeObjectsPerformSelector: (SEL)selector withObject: (id)object; /** * \brief Returns a copy of the array with the order reversed. * * \return A copy of the array with the order reversed */ - (OFArray*)reversedArray; #ifdef OF_HAVE_BLOCKS /** * \brief Executes a block for each object. * * \param block The block to execute for each object */ - (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block; |
︙ |
Modified src/OFArray.m from [3061fb79ac] to [276f05e269].
︙ | |||
549 550 551 552 553 554 555 556 557 558 559 560 561 562 | 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 | + + + + + + + + + + + | id *cArray = [self cArray]; size_t i, count = [self count]; for (i = 0; i < count; i++) ((void(*)(id, SEL, id))[cArray[i] methodForSelector: selector])(cArray[i], selector, object); } - (OFArray*)reversedArray { OFMutableArray *new = [[self mutableCopy] autorelease]; [new reverse]; [new makeImmutable]; return new; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count_ { /* FIXME: Use -[getObjects:inRange:] on the passed objects */ size_t count = [self count]; |
︙ |
Modified src/OFMutableArray.h from [28ac3abd54] to [5316dda09e].
︙ | |||
116 117 118 119 120 121 122 123 124 125 126 127 | 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 141 | + + + + + + + + + + + + + + | * \brief Replaces each object with the object returned by the block. * * \param block The block which returns a new object for each object */ - (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block; #endif /** * \brief Swaps the objects at the specified indices. * * \param index1 The index of the first object to swap * \param index2 The index of the second object to swap */ - (void)swapObjectAtIndex: (size_t)index1 withObjectAtIndex: (size_t)index2; /** * \brief Reverts the order of the objects in the array. */ - (void)reverse; /** * \brief Converts the mutable array to an immutable array. */ - (void)makeImmutable; @end |
Modified src/OFMutableArray.m from [c045ca3c7f] to [20b125814d].
︙ | |||
251 252 253 254 255 256 257 258 259 260 261 262 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | [self enumerateObjectsUsingBlock: ^ (id object, size_t index, BOOL *stop) { [self replaceObjectAtIndex: index withObject: block(object, index, stop)]; }]; } #endif - (void)swapObjectAtIndex: (size_t)index1 withObjectAtIndex: (size_t)index2 { id object1 = [self objectAtIndex: index1]; id object2 = [self objectAtIndex: index2]; [object1 retain]; @try { [self replaceObjectAtIndex: index1 withObject: object2]; [self replaceObjectAtIndex: index2 withObject: object1]; } @finally { [object1 release]; } } - (void)reverse { size_t i, j, count = [self count]; if (count == 0 || count == 1) return; for (i = 0, j = count - 1; i < j; i++, j--) [self swapObjectAtIndex: i withObjectAtIndex: j]; } - (void)makeImmutable { } @end |
Modified src/OFMutableArray_adjacent.m from [9d4a37306d] to [397d9a1a3d].
︙ | |||
196 197 198 199 200 201 202 203 204 205 206 207 208 209 | 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 235 236 237 238 239 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | { id object = [self objectAtIndex: [array count] - 1]; [array removeLastItem]; [object release]; mutations++; } - (void)swapObjectAtIndex: (size_t)index1 withObjectAtIndex: (size_t)index2 { id *cArray = [array cArray]; size_t count = [array count]; id tmp; if (index1 >= count || index2 >= count) @throw [OFOutOfRangeException exceptionWithClass: isa]; tmp = cArray[index1]; cArray[index1] = cArray[index2]; cArray[index2] = tmp; } - (void)reverse { id *cArray = [array cArray]; size_t i, j, count = [array count]; if (count == 0 || count == 1) return; for (i = 0, j = count - 1; i < j; i++, j--) { id tmp = cArray[i]; cArray[i] = cArray[j]; cArray[j] = tmp; } } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count { /* * Super means the implementation from OFArray here, as OFMutableArray |
︙ |
Modified tests/OFArrayTests.m from [196302b390] to [2fd6511491].
︙ | |||
136 137 138 139 140 141 142 143 144 145 146 147 148 149 | 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 | + + + + + + + + + + + + + + | [m[1] count] == 2 && [[m[1] objectAtIndex: 1] isEqual: c_ary[2]]) m[1] = [[a[0] mutableCopy] autorelease]; TEST(@"-[removeObjectsInRange:]", R([m[1] removeObjectsInRange: of_range(0, 2)]) && [m[1] count] == 1 && [[m[1] objectAtIndex: 0] isEqual: c_ary[2]]) m[1] = [[a[0] mutableCopy] autorelease]; [m[1] addObject: @"qux"]; [m[1] addObject: @"last"]; TEST(@"-[reverse]", R([m[1] reverse]) && [m[1] isEqual: ([OFArray arrayWithObjects: @"last", @"qux", @"Baz", @"Bar", @"Foo", nil])]) m[1] = [[a[0] mutableCopy] autorelease]; [m[1] addObject: @"qux"]; [m[1] addObject: @"last"]; TEST(@"-[reversedArray]", [[m[1] reversedArray] isEqual: ([OFArray arrayWithObjects: @"last", @"qux", @"Baz", @"Bar", @"Foo", nil])]) EXPECT_EXCEPTION(@"Detect out of range in -[objectAtIndex:]", OFOutOfRangeException, [a[0] objectAtIndex: [a[0] count]]) EXPECT_EXCEPTION(@"Detect out of range in -[removeNObjects:]", OFOutOfRangeException, [m[0] removeNObjects: [m[0] count] + 1]) TEST(@"-[componentsJoinedByString:]", |
︙ |