Comment: | Changes to OFDictionary, OFIterator and OFList - see details.
OFDictionary: OFIterator: OFList: |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
24ecf552971b901fdf32a4cce8243334 |
User & Date: | js on 2009-06-29 12:33:59 |
Other Links: | manifest | tags |
2009-06-29
| ||
17:42 | Don't use OFMutableStrings in OFExceptions. check-in: 8d61f0f51d user: js tags: trunk | |
12:33 | Changes to OFDictionary, OFIterator and OFList - see details. check-in: 24ecf55297 user: js tags: trunk | |
2009-06-18
| ||
19:08 | Get rid of OFXMLFactory. check-in: 612bc150e5 user: js tags: trunk | |
Modified src/OFDictionary.h from [c2a0d12c52] to [8038342f92].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | */ #include <stdarg.h> #import "OFObject.h" #import "OFList.h" #import "OFArray.h" /** * The OFDictionary class provides a class for using hash tables. */ @interface OFDictionary: OFObject { OFList **data; | > > > > > > > > > > > | 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 | */ #include <stdarg.h> #import "OFObject.h" #import "OFList.h" #import "OFArray.h" typedef struct __of_dictionary_list_object { /* of_list_object_t */ struct __of_dictionary_list_object *next; struct __of_dictionary_list_object *prev; id object; /* OFDictionary additions */ id key; uint32_t hash; } of_dictionary_list_object_t; /** * The OFDictionary class provides a class for using hash tables. */ @interface OFDictionary: OFObject { OFList **data; |
︙ | ︙ |
Modified src/OFDictionary.m from [ea26220ad7] to [9fa2393e86].
︙ | ︙ | |||
114 115 116 117 118 119 120 | return self; } - initWithKey: (OFObject <OFCopying>*)key andObject: (OFObject*)obj { Class c; | | | > > > | > | > | > < < | 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 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | return self; } - initWithKey: (OFObject <OFCopying>*)key andObject: (OFObject*)obj { Class c; uint32_t fullhash, hash; self = [self init]; if (key == nil || obj == nil) { c = isa; [self dealloc]; @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; } fullhash = [key hash]; hash = fullhash & (size - 1); @try { key = [key copy]; } @catch (OFException *e) { [self dealloc]; @throw e; } @try { of_dictionary_list_object_t *o; data[hash] = [[OFList alloc] initWithListObjectSize: sizeof(of_dictionary_list_object_t)]; o = (of_dictionary_list_object_t*)[data[hash] append: obj]; o->key = key; o->hash = fullhash; } @catch (OFException *e) { [key release]; [self dealloc]; @throw e; } return self; } - initWithKeys: (OFArray*)keys andObjects: (OFArray*)objs |
︙ | ︙ | |||
171 172 173 174 175 176 177 | andSelector: _cmd]; } keys_data = [keys data]; objs_data = [objs data]; for (i = 0; i < count; i++) { | | | > > > | > > > | > | > < < | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 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 217 218 219 220 221 222 223 224 | andSelector: _cmd]; } keys_data = [keys data]; objs_data = [objs data]; for (i = 0; i < count; i++) { uint32_t fullhash, hash; OFObject <OFCopying> *key; if (keys_data[i] == nil || objs_data[i] == nil) { c = isa; [self dealloc]; @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; } fullhash = [keys_data[i] hash]; hash = fullhash & (size - 1); @try { key = [keys_data[i] copy]; } @catch (OFException *e) { [self dealloc]; @throw e; } @try { of_dictionary_list_object_t *o; if (data[hash] == nil) data[hash] = [[OFList alloc] initWithListObjectSize: sizeof(of_dictionary_list_object_t)]; o = (of_dictionary_list_object_t*) [data[hash] append: objs_data[i]]; o->key = key; o->hash = fullhash; } @catch (OFException *e) { [key release]; [self dealloc]; @throw e; } } return self; } - initWithKeysAndObjects: (OFObject <OFCopying>*)first, ... |
︙ | ︙ | |||
226 227 228 229 230 231 232 | - initWithKey: (OFObject <OFCopying>*)first andArgList: (va_list)args { OFObject <OFCopying> *key; OFObject *obj; Class c; | | | > > > | > | > | > < < | > > > | > > > | > | > < < | | > | | | | 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 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 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | - initWithKey: (OFObject <OFCopying>*)first andArgList: (va_list)args { OFObject <OFCopying> *key; OFObject *obj; Class c; uint32_t fullhash, hash; self = [self init]; obj = va_arg(args, OFObject*); if (first == nil || obj == nil) { c = isa; [self dealloc]; @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; } fullhash = [first hash]; hash = fullhash & (size - 1); @try { key = [first copy]; } @catch (OFException *e) { [self dealloc]; @throw e; } @try { of_dictionary_list_object_t *o; if (data[hash] == nil) data[hash] = [[OFList alloc] initWithListObjectSize: sizeof(of_dictionary_list_object_t)]; o = (of_dictionary_list_object_t*)[data[hash] append: obj]; o->key = key; o->hash = fullhash; } @catch (OFException *e) { [key release]; [self dealloc]; @throw e; } while ((key = va_arg(args, OFObject <OFCopying>*)) != nil) { if ((obj = va_arg(args, OFObject*)) == nil) { c = isa; [self dealloc]; @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; } fullhash = [key hash]; hash = fullhash & (size - 1); @try { key = [key copy]; } @catch (OFException *e) { [self dealloc]; @throw e; } @try { of_dictionary_list_object_t *o; if (data[hash] == nil) data[hash] = [[OFList alloc] initWithListObjectSize: sizeof(of_dictionary_list_object_t)]; o = (of_dictionary_list_object_t*) [data[hash] append: obj]; o->key = key; o->hash = fullhash; } @catch (OFException *e) { [key release]; [self dealloc]; @throw e; } } return self; } - (float)averageItemsPerBucket { size_t items, buckets, i; items = 0; buckets = 0; for (i = 0; i < size; i++) { if (data[i] != nil) { items += [data[i] count]; buckets++; } } return (float)items / buckets; } - (id)objectForKey: (OFObject*)key { uint32_t hash; of_dictionary_list_object_t *iter; if (key == nil) @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; hash = [key hash] & (size - 1); if (data[hash] == nil) return nil; for (iter = (of_dictionary_list_object_t*)[data[hash] first]; iter != NULL; iter = iter->next) if ([iter->key isEqual: key]) return iter->object; return nil; } /* FIXME: Implement this! */ /* - (BOOL)isEqual |
︙ | ︙ | |||
351 352 353 354 355 356 357 | } */ - (void)dealloc { size_t i; | | | > > > > > > > > | 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 | } */ - (void)dealloc { size_t i; for (i = 0; i < size; i++) { if (data[i] != nil) { of_dictionary_list_object_t *iter; for (iter = (of_dictionary_list_object_t*) [data[i] first]; iter != NULL; iter = iter->next) [iter->key release]; [data[i] release]; } } [super dealloc]; } - setObject: (OFObject*)obj forKey: (OFObject <OFCopying>*)key { |
︙ | ︙ |
Modified src/OFIterator.h from [1a4ab06f2b] to [7d79beb13c].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFList.h" #import "OFDictionary.h" extern int _OFIterator_reference; /** * The OFIterator class provides methods to iterate through objects. */ @interface OFIterator: OFObject { OFList **data; size_t size; | > > > > > | | < < < < < < < < < < < | | | 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 52 53 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFList.h" #import "OFDictionary.h" typedef struct __of_iterator_pair { id key; id object; } of_iterator_pair_t; extern int _OFIterator_reference; /** * The OFIterator class provides methods to iterate through objects. */ @interface OFIterator: OFObject { OFList **data; size_t size; size_t pos; of_dictionary_list_object_t *last; } - initWithData: (OFList**)data andSize: (size_t)size; /** * \return A struct containing the next key and object */ - (of_iterator_pair_t)nextKeyObjectPair; /** * Resets the iterator, so the next call to nextObject returns the first again. */ - reset; @end @interface OFDictionary (OFIterator) /** * \return An OFIterator for the OFDictionary */ - (OFIterator*)iterator; @end |
Modified src/OFIterator.m from [d4a26c57c8] to [96f23ad28b].
︙ | ︙ | |||
28 29 30 31 32 33 34 | size = size_; last = NULL; return self; } | | > > > | | | > > | | > > | > > > | | > > | | < > | 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 | size = size_; last = NULL; return self; } - (of_iterator_pair_t)nextKeyObjectPair { of_iterator_pair_t next; for (;;) { if (last == NULL) { for (; pos < size && data[pos] == nil; pos++); if (pos == size) { next.key = nil; next.object = nil; return next; } last = (of_dictionary_list_object_t*) [data[pos++] first]; next.key = last->key; next.object = last->object; return next; } if ((last = last->next) != NULL) { next.key = last->key; next.object = last->object; return next; } } } - reset { pos = 0; last = NULL; |
︙ | ︙ |
Modified src/OFList.h from [8727a6856e] to [fdd2b6ed1c].
︙ | ︙ | |||
9 10 11 12 13 14 15 | * the packaging of this file. */ #import "OFObject.h" typedef struct __of_list_object { | < > > > > > > > > > > > > > > > > | 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 52 53 54 55 56 | * the packaging of this file. */ #import "OFObject.h" typedef struct __of_list_object { struct __of_list_object *next; struct __of_list_object *prev; id object; } of_list_object_t; /** * The OFList class provides easy to use double-linked lists. */ @interface OFList: OFObject <OFCopying> { of_list_object_t *first; of_list_object_t *last; size_t listobj_size; BOOL retain_and_release; } /** * \return A new autoreleased OFList */ + list; /** * \param listobj_size The size of a list object * \return A new autoreleased OFList with the specified list object size */ + listWithListObjectSize: (size_t)listobj_size; /** * Initializes an already allocated OFList with the specified list object size. * * \param listobj_size The size of a list object * \return An initialized OFList with the specified list object size */ - initWithListObjectSize: (size_t)listobj_size; /** * Initializes an already allocated OFList that does not retain/releas objects * added to it.. * * \return An initialized OFList */ - initWithoutRetainAndRelease; |
︙ | ︙ |
Modified src/OFList.m from [6a33891d13] to [f1ec98a7a2].
︙ | ︙ | |||
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 | #import "OFExceptions.h" @implementation OFList + list { return [[[self alloc] init] autorelease]; } - init { self = [super init]; first = NULL; last = NULL; retain_and_release = YES; return self; } - initWithoutRetainAndRelease { self = [super init]; first = NULL; last = NULL; return self; } - (void)dealloc { of_list_object_t *iter; | > > > > > > > > > > > > > > > > > > > > | 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 | #import "OFExceptions.h" @implementation OFList + list { return [[[self alloc] init] autorelease]; } + listWithListObjectSize: (size_t)listobj_size_ { return [[[self alloc] initWithListObjectSize: listobj_size_] autorelease]; } - init { self = [super init]; first = NULL; last = NULL; listobj_size = sizeof(of_list_object_t); retain_and_release = YES; return self; } - initWithListObjectSize: (size_t)listobj_size_; { self = [super init]; first = NULL; last = NULL; listobj_size = listobj_size_; retain_and_release = YES; return self; } - initWithoutRetainAndRelease { self = [super init]; first = NULL; last = NULL; listobj_size = sizeof(of_list_object_t); return self; } - (void)dealloc { of_list_object_t *iter; |
︙ | ︙ | |||
61 62 63 64 65 66 67 | return last; } - (of_list_object_t*)append: (id)obj { of_list_object_t *o; | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | return last; } - (of_list_object_t*)append: (id)obj { of_list_object_t *o; o = [self allocMemoryWithSize: listobj_size]; o->object = obj; o->next = NULL; o->prev = last; if (last != NULL) last->next = o; |
︙ | ︙ | |||
83 84 85 86 87 88 89 | return o; } - (of_list_object_t*)prepend: (id)obj { of_list_object_t *o; | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | return o; } - (of_list_object_t*)prepend: (id)obj { of_list_object_t *o; o = [self allocMemoryWithSize: listobj_size]; o->object = obj; o->next = first; o->prev = NULL; if (first != NULL) first->prev = o; |
︙ | ︙ | |||
106 107 108 109 110 111 112 | } - (of_list_object_t*)insert: (id)obj before: (of_list_object_t*)listobj { of_list_object_t *o; | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | } - (of_list_object_t*)insert: (id)obj before: (of_list_object_t*)listobj { of_list_object_t *o; o = [self allocMemoryWithSize: listobj_size]; o->object = obj; o->next = listobj; o->prev = listobj->prev; if (listobj->prev != NULL) listobj->prev->next = o; |
︙ | ︙ | |||
130 131 132 133 134 135 136 | } - (of_list_object_t*)insert: (id)obj after: (of_list_object_t*)listobj { of_list_object_t *o; | | | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | } - (of_list_object_t*)insert: (id)obj after: (of_list_object_t*)listobj { of_list_object_t *o; o = [self allocMemoryWithSize: listobj_size]; o->object = obj; o->next = listobj->next; o->prev = listobj; if (listobj->next != NULL) listobj->next->prev = o; |
︙ | ︙ | |||
214 215 216 217 218 219 220 | new = [[OFList alloc] initWithoutRetainAndRelease]; o = NULL; prev = NULL; @try { for (iter = first; iter != NULL; iter = iter->next) { | | | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | new = [[OFList alloc] initWithoutRetainAndRelease]; o = NULL; prev = NULL; @try { for (iter = first; iter != NULL; iter = iter->next) { o = [new allocMemoryWithSize: listobj_size]; o->object = iter->object; o->next = NULL; o->prev = prev; if (new->first == NULL) new->first = o; if (prev != NULL) |
︙ | ︙ |
Modified src/OFMutableDictionary.m from [bd2647bb71] to [eed907dfa3].
︙ | ︙ | |||
17 18 19 20 21 22 23 | #import "OFExceptions.h" #import "OFMacros.h" @implementation OFMutableDictionary - setObject: (OFObject*)obj forKey: (OFObject <OFCopying>*)key { | | | | > | > > | | | | < > < | < | | | | | | > | | | | | | | > | > > > | | > | 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 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 | #import "OFExceptions.h" #import "OFMacros.h" @implementation OFMutableDictionary - setObject: (OFObject*)obj forKey: (OFObject <OFCopying>*)key { uint32_t fullhash, hash; of_dictionary_list_object_t *iter; if (key == nil || obj == nil) @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; fullhash = [key hash]; hash = fullhash & (size - 1); if (data[hash] == nil) data[hash] = [[OFList alloc] initWithListObjectSize: sizeof(of_dictionary_list_object_t)]; for (iter = (of_dictionary_list_object_t*)[data[hash] first]; iter != NULL; iter = iter->next) { if ([iter->key isEqual: key]) { [iter->object release]; iter->object = [obj retain]; return self; } } key = [key copy]; @try { of_dictionary_list_object_t *o; o = (of_dictionary_list_object_t*)[data[hash] append: obj]; o->key = key; o->hash = fullhash; } @catch (OFException *e) { [key release]; @throw e; } return self; } - removeObjectForKey: (OFObject*)key { uint32_t hash; of_dictionary_list_object_t *iter; if (key == nil) @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; hash = [key hash] & (size - 1); if (data[hash] == nil) return self; for (iter = (of_dictionary_list_object_t*)[data[hash] first]; iter != NULL; iter = iter->next) { if ([iter->object isEqual: key]) { [iter->key release]; [data[hash] remove: (of_list_object_t*)iter]; if ([data[hash] first] == NULL) { [data[hash] release]; data[hash] = nil; } return self; } } return self; } - changeHashSize: (int)hashsize { OFList **newdata; size_t newsize, i; of_dictionary_list_object_t *iter; if (hashsize < 8 || hashsize >= 28) @throw [OFInvalidArgumentException newWithClass: isa andSelector: _cmd]; newsize = (size_t)1 << hashsize; newdata = [self allocMemoryForNItems: newsize withSize: sizeof(OFList*)]; memset(newdata, 0, newsize * sizeof(OFList*)); for (i = 0; i < size; i++) { if (OF_LIKELY(data[i] == nil)) continue; for (iter = (of_dictionary_list_object_t*)[data[i] first]; iter != NULL; iter = iter->next) { uint32_t hash = iter->hash & (newsize - 1); of_dictionary_list_object_t *o; if (newdata[hash] == nil) newdata[hash] = [[OFList alloc] initWithListObjectSize: sizeof(of_dictionary_list_object_t)]; o = (of_dictionary_list_object_t*) [newdata[hash] append: iter->object]; o->key = iter->key; o->hash = iter->hash; } [data[i] release]; } [self freeMemory: data]; data = newdata; |
︙ | ︙ |
Modified src/OFXMLElement.m from [61f052da6e] to [8ca104aaaa].
︙ | ︙ | |||
56 57 58 59 60 61 62 | - (OFString*)string { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; char *str_c; size_t len, i, j; OFString *ret, *tmp; | < > | > | < > | < | | | | | | | | | | | | | | > | | | | | | > | 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 | - (OFString*)string { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; char *str_c; size_t len, i, j; OFString *ret, *tmp; len = [name length] + 4; str_c = [self allocMemoryWithSize: len]; /* Start of tag */ *str_c = '<'; memcpy(str_c + 1, [name cString], [name length]); i = [name length] + 1; /* Attributes */ if (attrs != nil) { OFIterator *iter = [attrs iterator]; for (;;) { of_iterator_pair_t pair; pair = [iter nextKeyObjectPair]; if (pair.key == nil || pair.object == nil) break; tmp = [pair.object stringByXMLEscaping]; len += [pair.key length] + [tmp length] + 4; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (OFException *e) { [self freeMemory: str_c]; @throw e; } str_c[i++] = ' '; memcpy(str_c + i, [pair.key cString], [pair.key length]); i += [pair.key length]; str_c[i++] = '='; str_c[i++] = '\''; memcpy(str_c + i, [tmp cString], [tmp length]); i += [tmp length]; str_c[i++] = '\''; [pool releaseObjects]; } } /* Childen */ if (stringval != nil || children != nil) { if (stringval != nil) tmp = [stringval stringByXMLEscaping]; else if (children != nil) { |
︙ | ︙ |
Modified tests/OFDictionary/OFDictionary.m from [a32035138d] to [ae3f01c9a0].
︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 | int main() { int i = 0; OFDictionary *dict = [OFMutableDictionary dictionaryWithHashSize: 16]; OFIterator *iter = [dict iterator]; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFString *key1 = [OFString stringWithCString: "key1"]; OFString *key2 = [OFString stringWithCString: "key2"]; OFString *value1 = [OFString stringWithCString: "value1"]; OFString *value2 = [OFString stringWithCString: "value2"]; | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | int main() { int i = 0; OFDictionary *dict = [OFMutableDictionary dictionaryWithHashSize: 16]; OFIterator *iter = [dict iterator]; of_iterator_pair_t pair[2]; OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFString *key1 = [OFString stringWithCString: "key1"]; OFString *key2 = [OFString stringWithCString: "key2"]; OFString *value1 = [OFString stringWithCString: "value1"]; OFString *value2 = [OFString stringWithCString: "value2"]; |
︙ | ︙ | |||
50 51 52 53 54 55 56 | i++; if (strcmp([[dict objectForKey: key2] cString], "value2")) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); return 1; } i++; | > > | | | | > > | | | | | | 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 | i++; if (strcmp([[dict objectForKey: key2] cString], "value2")) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); return 1; } i++; pair[0] = [iter nextKeyObjectPair]; pair[1] = [iter nextKeyObjectPair]; if (![pair[0].key isEqual: @"key2"] || ![pair[0].object isEqual: @"value2"] || ![pair[1].key isEqual: @"key1"] || ![pair[1].object isEqual: @"value1"]) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); return 1; } i++; [dict changeHashSize: 8]; iter = [dict iterator]; pair[0] = [iter nextKeyObjectPair]; pair[1] = [iter nextKeyObjectPair]; if (![pair[0].key isEqual: @"key1"] || ![pair[0].object isEqual: @"value1"] || ![pair[1].key isEqual: @"key2"] || ![pair[1].object isEqual: @"value2"]) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); return 1; } i++; if ([dict averageItemsPerBucket] != 1.0) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); return 1; } i++; if ([iter nextKeyObjectPair].object != nil) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); return 1; } i++; if ([dict objectForKey: @"key3"] != nil) { printf("\033[K\033[1;31mTest %d/%d failed!\033[m\n", i, TESTS); |
︙ | ︙ |