Differences From Artifact [650b5ba321]:
- File src/OFArray_adjacent.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: 6118) [annotate] [blame] [check-ins using]
To Artifact [cb33472061]:
- File
src/OFArray_adjacent.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: 6144) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
83 84 85 86 87 88 89 |
}
return self;
}
- initWithArray: (OFArray*)array_
{
| | | | | | | | | | | | 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 136 137 138 139 140 141 142 143 144 145 146 147 |
}
return self;
}
- initWithArray: (OFArray*)array_
{
id *objects;
size_t i, count;
self = [self init];
@try {
objects = [array_ objects];
count = [array_ count];
} @catch (id e) {
[self release];
@throw e;
}
@try {
for (i = 0; i < count; i++)
[objects[i] retain];
[array addNItems: count
fromCArray: objects];
} @catch (id e) {
for (i = 0; i < count; i++)
[objects[i] release];
/* Prevent double-release of objects */
[array release];
array = nil;
[self release];
@throw e;
}
return self;
}
- initWithObjects: (id*)objects
count: (size_t)count
{
self = [self init];
@try {
size_t i;
for (i = 0; i < count; i++)
[objects[i] retain];
[array addNItems: count
fromCArray: objects];
} @catch (id e) {
size_t i;
for (i = 0; i < count; i++)
[objects[i] release];
[self release];
@throw e;
}
return self;
|
| ︙ | ︙ | |||
187 188 189 190 191 192 193 |
}
- (size_t)count
{
return [array count];
}
| | | | | | | | | | | | | | | | | | | | | 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 225 226 227 228 229 230 231 232 233 234 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 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 |
}
- (size_t)count
{
return [array count];
}
- (id*)objects
{
return [array cArray];
}
- (id)objectAtIndex: (size_t)index
{
return *((id*)[array itemAtIndex: index]);
}
- (void)getObjects: (id*)buffer
inRange: (of_range_t)range
{
id *objects = [array cArray];
size_t i, count = [array count];
if (range.start + range.length > count)
@throw [OFOutOfRangeException exceptionWithClass: isa];
for (i = 0; i < range.length; i++)
buffer[i] = objects[range.start + i];
}
- (size_t)indexOfObject: (id)object
{
id *objects = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++)
if ([objects[i] isEqual: object])
return i;
return OF_INVALID_INDEX;
}
- (size_t)indexOfObjectIdenticalTo: (id)object
{
id *objects = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++)
if (objects[i] == object)
return i;
return OF_INVALID_INDEX;
}
- (OFArray*)objectsInRange: (of_range_t)range
{
size_t count;
if (![self isKindOfClass: [OFMutableArray class]])
return [OFArray_adjacentSubarray arrayWithArray: self
range: range];
count = [array count];
if (range.start + range.length > count)
@throw [OFOutOfRangeException exceptionWithClass: isa];
return [OFArray arrayWithObjects: (id*)[array cArray] + range.start
count: range.length];
}
- (BOOL)isEqual: (id)object
{
OFArray *otherArray;
id *objects, *otherObjects;
size_t i, count;
if ([object class] != [OFArray_adjacent class] &&
[object class] != [OFMutableArray_adjacent class] &&
[object class] != [OFArray_adjacentSubarray class])
return [super isEqual: object];
otherArray = object;
count = [array count];
if (count != [otherArray count])
return NO;
objects = [array cArray];
otherObjects = [otherArray objects];
for (i = 0; i < count; i++)
if (![objects[i] isEqual: otherObjects[i]])
return NO;
return YES;
}
- (uint32_t)hash
{
id *objects = [array cArray];
size_t i, count = [array 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);
}
OF_HASH_FINALIZE(hash);
return hash;
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
{
id *objects = [array cArray];
size_t i, count = [array count];
BOOL stop = NO;
for (i = 0; i < count && !stop; i++)
block(objects[i], i, &stop);
}
#endif
- (void)dealloc
{
id *objects = [array cArray];
size_t i, count = [array count];
for (i = 0; i < count; i++)
[objects[i] release];
[array release];
[super dealloc];
}
@end
|