Overview
Comment: | More methods using blocks. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
e84073d0f979589bec870b519938c015 |
User & Date: | js on 2010-08-29 17:53:56 |
Other Links: | manifest | tags |
Context
2010-09-05
| ||
14:45 | Only define _WIN32_WINNT if it is not already defined. check-in: f0bd8d731e user: js tags: trunk | |
2010-08-29
| ||
17:53 | More methods using blocks. check-in: e84073d0f9 user: js tags: trunk | |
2010-08-28
| ||
18:54 | Initial support for blocks. check-in: c5d65603d8 user: js tags: trunk | |
Changes
Modified src/OFMutableArray.h from [a3cee17e91] to [a6aa74e205].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * 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 "OFArray.h" /** * \brief A class for storing, adding and removing objects in an array. */ @interface OFMutableArray: OFArray { unsigned long mutations; } | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | /* * 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 "OFArray.h" #ifdef OF_HAVE_BLOCKS typedef id (^of_array_replace_block_t)(id obj, size_t idx, BOOL *stop); #endif /** * \brief A class for storing, adding and removing objects in an array. */ @interface OFMutableArray: OFArray { unsigned long mutations; } |
︙ | ︙ | |||
98 99 100 101 102 103 104 105 | * Removes the specified amount of objects at the specified index. * * \param nobjects The number of objects to remove * \param index The index at which the objects are removed */ - (void)removeNObjects: (size_t)nobjects atIndex: (size_t)index; @end | > > > > > > > > > | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | * Removes the specified amount of objects at the specified index. * * \param nobjects The number of objects to remove * \param index The index at which the objects are removed */ - (void)removeNObjects: (size_t)nobjects atIndex: (size_t)index; #ifdef OF_HAVE_BLOCKS /** * 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 @end |
Modified src/OFMutableArray.m from [ad03860f72] to [fc5290b53c].
︙ | ︙ | |||
248 249 250 251 252 253 254 255 256 | if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa]; block(objs[i], i, &stop); } } #endif @end | > > > > > > > > > > > > > > > > > > > > > > > > | 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 | if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa]; block(objs[i], i, &stop); } } - (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block { OFObject **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]; id new = block(objs[i], i, &stop); if (new == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; [new retain]; [objs[i] release]; objs[i] = new; } } #endif @end |
Modified src/OFMutableDictionary.h from [034e4119e3] to [8e6d4d0e2c].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * 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 "OFDictionary.h" /** * \brief A class for using mutable hash tables. */ @interface OFMutableDictionary: OFDictionary { unsigned long mutations; } | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | /* * 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 "OFDictionary.h" #ifdef OF_HAVE_BLOCKS typedef id (^of_dictionary_replace_block_t)(id key, id obj, BOOL *stop); #endif /** * \brief A class for using mutable hash tables. */ @interface OFMutableDictionary: OFDictionary { unsigned long mutations; } |
︙ | ︙ | |||
31 32 33 34 35 36 37 38 | /** * Remove the object with the given key from the dictionary. * * \param key The key whose object should be removed */ - (void)removeObjectForKey: (OFObject*)key; @end | > > > > > > > > > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | /** * Remove the object with the given key from the dictionary. * * \param key The key whose object should be removed */ - (void)removeObjectForKey: (OFObject*)key; #ifdef OF_HAVE_BLOCKS /** * 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_dictionary_replace_block_t)block; #endif @end |
Modified src/OFMutableDictionary.m from [5c1939bedc] to [9fd6867bb8].
︙ | ︙ | |||
278 279 280 281 282 283 284 285 286 | @throw [OFEnumerationMutationException newWithClass: isa]; if (data[i] != NULL && data[i] != DELETED) block(data[i]->key, data[i]->object, &stop); } } #endif @end | > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | @throw [OFEnumerationMutationException newWithClass: isa]; if (data[i] != NULL && data[i] != DELETED) block(data[i]->key, data[i]->object, &stop); } } - (void)replaceObjectsUsingBlock: (of_dictionary_replace_block_t)block { size_t i; BOOL stop = NO; unsigned long mutations2 = mutations; for (i = 0; i < size && !stop; i++) { if (mutations != mutations2) @throw [OFEnumerationMutationException newWithClass: isa]; if (data[i] != NULL && data[i] != DELETED) { id new = block(data[i]->key, data[i]->object, &stop); if (new == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; [new retain]; [data[i]->object release]; data[i]->object = new; } } } #endif @end |
Modified tests/OFArrayTests.m from [ff3793f72c] to [f1dd14b8b5].
︙ | ︙ | |||
218 219 220 221 222 223 224 225 226 227 228 229 | ok = YES; [e dealloc]; } TEST(@"Detection of mutation during enumeration using blocks", ok) } #endif [pool drain]; } @end | > > > > > > > > > > > > > > | 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 | ok = YES; [e dealloc]; } TEST(@"Detection of mutation during enumeration using blocks", ok) } TEST(@"-[replaceObjectsUsingBlock:]", R([m[0] replaceObjectsUsingBlock: ^ id (id obj, size_t idx, BOOL *stop) { switch (idx) { case 0: return @"foo"; case 1: return @"bar"; } return nil; }]) && [[m[0] objectAtIndex: 0] isEqual: @"foo"] && [[m[0] objectAtIndex: 1] isEqual: @"bar"]) #endif [pool drain]; } @end |
Modified tests/OFDictionaryTests.m from [16f274bf48] to [9041d899a3].
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 102 | ok = YES; [e dealloc]; } TEST(@"Detection of mutation during Fast Enumeration", ok) [dict removeObjectForKey: @""]; #endif #ifdef OF_HAVE_BLOCKS { __block size_t i = 0; __block BOOL ok = YES; | > > > > > > > > > > > > | 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 | ok = YES; [e dealloc]; } TEST(@"Detection of mutation during Fast Enumeration", ok) [dict removeObjectForKey: @""]; TEST(@"-[replaceObjectsUsingBlock:]", R([dict replaceObjectsUsingBlock: ^ id (id key, id obj, BOOL *stop) { if ([key isEqual: keys[0]]) return @"value_1"; if ([key isEqual: keys[1]]) return @"value_2"; return nil; }]) && [[dict objectForKey: keys[0]] isEqual: @"value_1"] && [[dict objectForKey: keys[1]] isEqual: @"value_2"]) #endif #ifdef OF_HAVE_BLOCKS { __block size_t i = 0; __block BOOL ok = YES; |
︙ | ︙ |