Differences From Artifact [8fffeb8088]:
- File src/OFArray.m — part of check-in [32f7b1390a] at 2012-03-12 11:01:07 on branch trunk — Remove +[OFArray arrayWithCArray:] as it is pretty useless. (user: js, size: 13769) [annotate] [blame] [check-ins using]
To Artifact [f4dee3f63a]:
- File
src/OFArray.m
— part of check-in
[008be86a16]
at
2012-03-12 11:54:22
on branch trunk
— OFArray: +[arrayWithCArray:length:] -> +[arrayWithObjects:count:].
This is required for the new array literals. (user: js, size: 13794) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
71 72 73 74 75 76 77 | } - initWithArray: (OFArray*)array { return (id)[[OFArray_adjacent alloc] initWithArray: array]; } | | | | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | } - initWithArray: (OFArray*)array { return (id)[[OFArray_adjacent alloc] initWithArray: array]; } - initWithObjects: (id*)objects count: (size_t)count { return (id)[[OFArray_adjacent alloc] initWithObjects: objects count: count]; } - initWithSerialization: (OFXMLElement*)element { return (id)[[OFArray_adjacent alloc] initWithSerialization: element]; } |
︙ | ︙ | |||
148 149 150 151 152 153 154 | } + arrayWithArray: (OFArray*)array { return [[[self alloc] initWithArray: array] autorelease]; } | | | | | | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | } + arrayWithArray: (OFArray*)array { return [[[self alloc] initWithArray: array] autorelease]; } + arrayWithObjects: (id*)objects count: (size_t)count { return [[[self alloc] initWithObjects: objects count: count] autorelease]; } - init { if (isa == [OFArray class]) { Class c = isa; [self release]; |
︙ | ︙ | |||
202 203 204 205 206 207 208 | { Class c = isa; [self release]; @throw [OFNotImplementedException exceptionWithClass: c selector: _cmd]; } | | | | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | { Class c = isa; [self release]; @throw [OFNotImplementedException exceptionWithClass: c selector: _cmd]; } - initWithObjects: (id*)objects count: (size_t)count { Class c = isa; [self release]; @throw [OFNotImplementedException exceptionWithClass: c selector: _cmd]; } |
︙ | ︙ | |||
234 235 236 237 238 239 240 | { size_t i; for (i = 0; i < range.length; i++) buffer[i] = [self objectAtIndex: range.start + i]; } | | | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | { size_t i; for (i = 0; i < range.length; i++) buffer[i] = [self objectAtIndex: range.start + i]; } - (id*)objects { OFObject *container; size_t count; id *buffer; container = [[[OFObject alloc] init] autorelease]; count = [self count]; |
︙ | ︙ | |||
333 334 335 336 337 338 339 | buffer = [self allocMemoryForNItems: range.length ofSize: sizeof(*buffer)]; @try { [self getObjects: buffer inRange: range]; | | | | | | | | 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 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 | buffer = [self allocMemoryForNItems: range.length ofSize: sizeof(*buffer)]; @try { [self getObjects: buffer inRange: range]; ret = [OFArray arrayWithObjects: buffer count: range.length]; } @finally { [self freeMemory: buffer]; } return ret; } - (OFString*)componentsJoinedByString: (OFString*)separator { return [self componentsJoinedByString: separator usingSelector: @selector(description)]; } - (OFString*)componentsJoinedByString: (OFString*)separator usingSelector: (SEL)selector { OFAutoreleasePool *pool, *pool2; OFMutableString *ret; id *objects; size_t i, count = [self count]; IMP append; if (count == 0) return @""; if (count == 1) return [[self firstObject] performSelector: selector]; ret = [OFMutableString string]; append = [ret methodForSelector: @selector(appendString:)]; pool = [[OFAutoreleasePool alloc] init]; objects = [self objects]; pool2 = [[OFAutoreleasePool alloc] init]; for (i = 0; i < count - 1; i++) { append(ret, @selector(appendString:), [objects[i] performSelector: selector]); append(ret, @selector(appendString:), separator); [pool2 releaseObjects]; } append(ret, @selector(appendString:), [objects[i] performSelector: selector]); [ret makeImmutable]; [pool release]; return ret; } |
︙ | ︙ | |||
413 414 415 416 417 418 419 | return NO; return YES; } - (uint32_t)hash { | | | | 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 | return NO; return YES; } - (uint32_t)hash { id *objects = [self objects]; size_t i, count = [self count]; uint32_t hash; OF_HASH_INIT(hash); for (i = 0; i < count; i++) { uint32_t h = [objects[i] hash]; OF_HASH_ADD(hash, h >> 24); OF_HASH_ADD(hash, (h >> 16) & 0xFF); OF_HASH_ADD(hash, (h >> 8) & 0xFF); OF_HASH_ADD(hash, h & 0xFF); } |
︙ | ︙ | |||
467 468 469 470 471 472 473 | } - (OFXMLElement*)XMLElementBySerializing { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFAutoreleasePool *pool2; OFXMLElement *element; | | | | 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | } - (OFXMLElement*)XMLElementBySerializing { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFAutoreleasePool *pool2; OFXMLElement *element; id <OFSerialization> *objects = [self objects]; size_t i, count = [self count]; if ([self isKindOfClass: [OFMutableArray class]]) element = [OFXMLElement elementWithName: @"OFMutableArray" namespace: OF_SERIALIZATION_NS]; else element = [OFXMLElement elementWithName: @"OFArray" namespace: OF_SERIALIZATION_NS]; pool2 = [[OFAutoreleasePool alloc] init]; for (i = 0; i < count; i++) { [element addChild: [objects[i] XMLElementBySerializing]]; [pool2 releaseObjects]; } [element retain]; [pool release]; [element autorelease]; |
︙ | ︙ | |||
513 514 515 516 517 518 519 | [JSON makeImmutable]; return JSON; } - (void)makeObjectsPerformSelector: (SEL)selector { | | | | | | | | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | [JSON makeImmutable]; return JSON; } - (void)makeObjectsPerformSelector: (SEL)selector { id *objects = [self objects]; size_t i, count = [self count]; for (i = 0; i < count; i++) ((void(*)(id, SEL))[objects[i] methodForSelector: selector])(objects[i], selector); } - (void)makeObjectsPerformSelector: (SEL)selector withObject: (id)object { id *objects = [self objects]; size_t i, count = [self count]; for (i = 0; i < count; i++) ((void(*)(id, SEL, id))[objects[i] methodForSelector: selector])(objects[i], selector, object); } - (OFArray*)sortedArray { OFMutableArray *new = [[self mutableCopy] autorelease]; [new sort]; |
︙ | ︙ | |||
568 569 570 571 572 573 574 | if (count > INT_MAX) @throw [OFOutOfRangeException exceptionWithClass: isa]; if (state->state >= count) return 0; state->state = count; | | | 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 | if (count > INT_MAX) @throw [OFOutOfRangeException exceptionWithClass: isa]; if (state->state >= count) return 0; state->state = count; state->itemsPtr = [self objects]; state->mutationsPtr = (unsigned long*)self; return (int)count; } - (OFEnumerator*)objectEnumerator { |
︙ | ︙ | |||
609 610 611 612 613 614 615 | @try { [self enumerateObjectsUsingBlock: ^ (id object, size_t index, BOOL *stop) { tmp[index] = block(object, index); }]; | | | | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 | @try { [self enumerateObjectsUsingBlock: ^ (id object, size_t index, BOOL *stop) { tmp[index] = block(object, index); }]; ret = [OFArray arrayWithObjects: tmp count: count]; } @finally { [self freeMemory: tmp]; } return ret; } |
︙ | ︙ | |||
634 635 636 637 638 639 640 | [self enumerateObjectsUsingBlock: ^ (id object, size_t index, BOOL *stop) { if (block(object, index)) tmp[i++] = object; }]; | | | | 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 | [self enumerateObjectsUsingBlock: ^ (id object, size_t index, BOOL *stop) { if (block(object, index)) tmp[i++] = object; }]; ret = [OFArray arrayWithObjects: tmp count: i]; } @finally { [self freeMemory: tmp]; } return ret; } |
︙ | ︙ |