Differences From Artifact [fc5290b53c]:
- File src/OFMutableArray.m — part of check-in [e84073d0f9] at 2010-08-29 17:53:56 on branch trunk — More methods using blocks. (user: js, size: 5650) [annotate] [blame] [check-ins using]
To Artifact [6ea5171a82]:
- File
src/OFMutableArray.m
— part of check-in
[e2b06423e0]
at
2010-09-05 23:19:08
on branch trunk
— Replace OFObject* with id in many places.
We assume now that every object understands retain, release, etc. so
that we can weaken the type from OFObject* to id. This makes it
possible to use different root object classes. (user: js, size: 5480) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
17 18 19 20 21 22 23 |
#import "OFDataArray.h"
#import "OFExceptions.h"
@implementation OFMutableArray
- copy
{
OFArray *new = [[OFArray alloc] init];
| | | | | | | | | | | | | | | | 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 |
#import "OFDataArray.h"
#import "OFExceptions.h"
@implementation OFMutableArray
- copy
{
OFArray *new = [[OFArray alloc] init];
id *objs;
size_t count, i;
objs = [array cArray];
count = [array count];
[new->array addNItems: count
fromCArray: objs];
for (i = 0; i < count; i++)
[objs[i] retain];
return new;
}
- (void)addObject: (id)obj
{
[array addItem: &obj];
[obj retain];
mutations++;
}
- (void)addObject: (id)obj
atIndex: (size_t)index
{
[array addItem: &obj
atIndex: index];
[obj retain];
mutations++;
}
- (void)replaceObject: (id)old
withObject: (id)new
{
id *objs = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++) {
if ([objs[i] isEqual: old]) {
[new retain];
[objs[i] release];
objs[i] = new;
}
}
}
- (id)replaceObjectAtIndex: (size_t)index
withObject: (id)obj
{
id *objs = [array cArray];
id old;
if (index >= [array count])
@throw [OFOutOfRangeException newWithClass: isa];
old = objs[index];
objs[index] = [obj retain];
return [old autorelease];
}
- (void)replaceObjectIdenticalTo: (id)old
withObject: (id)new
{
id *objs = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++) {
if (objs[i] == old) {
[new retain];
[objs[i] release];
objs[i] = new;
}
}
}
- (void)removeObject: (id)obj
{
id *objs = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++) {
if ([objs[i] isEqual: obj]) {
id obj = objs[i];
[array removeItemAtIndex: i];
mutations++;
[obj release];
/*
|
| ︙ | ︙ | |||
124 125 126 127 128 129 130 | objs = [array cArray]; count--; i--; } } } | | | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 |
objs = [array cArray];
count--;
i--;
}
}
}
- (void)removeObjectIdenticalTo: (id)obj
{
id *objs = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++) {
if (objs[i] == obj) {
[array removeItemAtIndex: i];
mutations++;
|
| ︙ | ︙ | |||
163 164 165 166 167 168 169 |
atIndex: index];
return old;
}
- (void)removeNObjects: (size_t)nobjects
{
| | | | | | | | 163 164 165 166 167 168 169 170 171 172 173 174 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 |
atIndex: index];
return old;
}
- (void)removeNObjects: (size_t)nobjects
{
id *objs = [array cArray], *copy;
size_t i, count = [array count];
if (nobjects > count)
@throw [OFOutOfRangeException newWithClass: isa];
copy = [self allocMemoryForNItems: nobjects
withSize: sizeof(id)];
memcpy(copy, objs + (count - nobjects), nobjects * sizeof(id));
@try {
[array removeNItems: nobjects];
mutations++;
for (i = 0; i < nobjects; i++)
[copy[i] release];
} @finally {
[self freeMemory: copy];
}
}
- (void)removeNObjects: (size_t)nobjects
atIndex: (size_t)index
{
id *objs = [array cArray], *copy;
size_t i, count = [array count];
if (nobjects > count - index)
@throw [OFOutOfRangeException newWithClass: isa];
copy = [self allocMemoryForNItems: nobjects
withSize: sizeof(id)];
memcpy(copy, objs + index, nobjects * sizeof(id));
@try {
[array removeNItems: nobjects
atIndex: index];
mutations++;
for (i = 0; i < nobjects; i++)
|
| ︙ | ︙ | |||
235 236 237 238 239 240 241 |
initWithDataArray: array
mutationsPointer: &mutations] autorelease];
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
{
| | | | 235 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 |
initWithDataArray: array
mutationsPointer: &mutations] autorelease];
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
{
id *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];
block(objs[i], i, &stop);
}
}
- (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block
{
id *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
|
| ︙ | ︙ |