Differences From Artifact [064f669702]:
- File
src/OFList.m
— part of check-in
[44f45c2e35]
at
2017-01-09 17:36:36
on branch trunk
— Update copyright
Forgot to add 2017, even though I already did quite some changes in
2017. (user: js, size: 9252) [annotate] [blame] [check-ins using]
To Artifact [e2872c89cd]:
- File
src/OFList.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 9269) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
32 33 34 35 36 37 38 |
@synthesize lastListObject = _lastListObject;
+ (instancetype)list
{
return [[[self alloc] init] autorelease];
}
| | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 |
@synthesize lastListObject = _lastListObject;
+ (instancetype)list
{
return [[[self alloc] init] autorelease];
}
- initWithSerialization: (OFXMLElement *)element
{
self = [self init];
@try {
void *pool = objc_autoreleasePoolPush();
if (![[element name] isEqual: [self className]] ||
|
| ︙ | ︙ | |||
70 71 72 73 74 75 76 | for (of_list_object_t *iter = _firstListObject; iter != NULL; iter = iter->next) [iter->object release]; [super dealloc]; } | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
for (of_list_object_t *iter = _firstListObject;
iter != NULL; iter = iter->next)
[iter->object release];
[super dealloc];
}
- (of_list_object_t *)appendObject: (id)object
{
of_list_object_t *listObject;
listObject = [self allocMemoryWithSize: sizeof(of_list_object_t)];
listObject->object = [object retain];
listObject->next = NULL;
listObject->previous = _lastListObject;
|
| ︙ | ︙ | |||
92 93 94 95 96 97 98 | _count++; _mutations++; return listObject; } | | | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
_count++;
_mutations++;
return listObject;
}
- (of_list_object_t *)prependObject: (id)object
{
of_list_object_t *listObject;
listObject = [self allocMemoryWithSize: sizeof(of_list_object_t)];
listObject->object = [object retain];
listObject->next = _firstListObject;
listObject->previous = NULL;
|
| ︙ | ︙ | |||
114 115 116 117 118 119 120 | _count++; _mutations++; return listObject; } | | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 |
_count++;
_mutations++;
return listObject;
}
- (of_list_object_t *)insertObject: (id)object
beforeListObject: (of_list_object_t *)listObject
{
of_list_object_t *newListObject;
newListObject = [self allocMemoryWithSize: sizeof(of_list_object_t)];
newListObject->object = [object retain];
newListObject->next = listObject;
newListObject->previous = listObject->previous;
|
| ︙ | ︙ | |||
138 139 140 141 142 143 144 | _count++; _mutations++; return newListObject; } | | | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 |
_count++;
_mutations++;
return newListObject;
}
- (of_list_object_t *)insertObject: (id)object
afterListObject: (of_list_object_t *)listObject
{
of_list_object_t *newListObject;
newListObject = [self allocMemoryWithSize: sizeof(of_list_object_t)];
newListObject->object = [object retain];
newListObject->next = listObject->next;
newListObject->previous = listObject;
|
| ︙ | ︙ | |||
162 163 164 165 166 167 168 | _count++; _mutations++; return newListObject; } | | | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 |
_count++;
_mutations++;
return newListObject;
}
- (void)removeListObject: (of_list_object_t *)listObject
{
if (listObject->previous != NULL)
listObject->previous->next = listObject->next;
if (listObject->next != NULL)
listObject->next->previous = listObject->previous;
if (_firstListObject == listObject)
|
| ︙ | ︙ | |||
315 316 317 318 319 320 321 | OF_HASH_ADD_HASH(hash, [iter->object hash]); OF_HASH_FINALIZE(hash); return hash; } | | | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 |
OF_HASH_ADD_HASH(hash, [iter->object hash]);
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString *)description
{
OFMutableString *ret;
if (_count == 0)
return @"[]";
ret = [OFMutableString stringWithString: @"[\n"];
|
| ︙ | ︙ | |||
344 345 346 347 348 349 350 | [ret appendString: @"\n]"]; [ret makeImmutable]; return ret; } | | | | | 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 |
[ret appendString: @"\n]"];
[ret makeImmutable];
return ret;
}
- (OFXMLElement *)XMLElementBySerializing
{
OFXMLElement *element =
[OFXMLElement elementWithName: [self className]
namespace: OF_SERIALIZATION_NS];
for (of_list_object_t *iter = _firstListObject;
iter != NULL; iter = iter->next) {
void *pool = objc_autoreleasePoolPush();
[element addChild: [iter->object XMLElementBySerializing]];
objc_autoreleasePoolPop(pool);
}
return element;
}
- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
objects: (id *)objects
count: (int)count
{
of_list_object_t *listObject;
memcpy(&listObject, state->extra, sizeof(listObject));
state->itemsPtr = objects;
|
| ︙ | ︙ | |||
391 392 393 394 395 396 397 | } memcpy(state->extra, &listObject, sizeof(listObject)); return count; } | | | | | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 |
}
memcpy(state->extra, &listObject, sizeof(listObject));
return count;
}
- (OFEnumerator *)objectEnumerator
{
return [[[OFListEnumerator alloc]
initWithList: self
mutationsPointer: &_mutations] autorelease];
}
@end
@implementation OFListEnumerator
- initWithList: (OFList *)list
mutationsPointer: (unsigned long *)mutationsPtr
{
self = [super init];
_list = [list retain];
_current = [list firstListObject];
_mutations = *mutationsPtr;
_mutationsPtr = mutationsPtr;
|
| ︙ | ︙ |