Differences From Artifact [7df94bcaeb]:
- File
src/OFArray.m
— part of check-in
[494dca4ae4]
at
2011-05-14 12:26:39
on branch trunk
— Use XML for serialization.
This way, we don't need a new parser and don't use a new format. (user: js, size: 11940) [annotate] [blame] [check-ins using]
To Artifact [d444e53917]:
- File src/OFArray.m — part of check-in [1e249becdf] at 2011-05-19 00:47:55 on branch trunk — Add +[OFArray arrayWithArray:]. (user: js, size: 12339) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
va_start(arguments, firstObject);
ret = [[[self alloc] initWithObject: firstObject
arguments: arguments] autorelease];
va_end(arguments);
return ret;
}
+ arrayWithCArray: (id*)objects
{
return [[[self alloc] initWithCArray: objects] autorelease];
}
+ arrayWithCArray: (id*)objects
| > > > > > | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
va_start(arguments, firstObject);
ret = [[[self alloc] initWithObject: firstObject
arguments: arguments] autorelease];
va_end(arguments);
return ret;
}
+ arrayWithArray: (OFArray*)array
{
return [[[self alloc] initWithArray: array] autorelease];
}
+ arrayWithCArray: (id*)objects
{
return [[[self alloc] initWithCArray: objects] autorelease];
}
+ arrayWithCArray: (id*)objects
|
| ︙ | ︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
[firstObject retain];
while ((object = va_arg(arguments, id)) != nil) {
[array addItem: &object];
[object retain];
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 162 163 164 165 166 167 168 169 170 171 172 173 |
[firstObject retain];
while ((object = va_arg(arguments, id)) != nil) {
[array addItem: &object];
[object retain];
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- initWithArray: (OFArray*)array_
{
id *cArray;
size_t i, count;
self = [self init];
@try {
cArray = [array_ cArray];
count = [array_ count];
} @catch (id e) {
[self release];
@throw e;
}
@try {
for (i = 0; i < count; i++)
[cArray[i] retain];
[array addNItems: count
fromCArray: cArray];
} @catch (id e) {
for (i = 0; i < count; i++)
[cArray[i] release];
/* Prevent double-release of objects */
[array release];
array = nil;
[self release];
@throw e;
}
return self;
}
|
| ︙ | ︙ | |||
197 198 199 200 201 202 203 |
- copy
{
return [self retain];
}
- mutableCopy
{
| | < < < < < < < < < < < < < | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 |
- copy
{
return [self retain];
}
- mutableCopy
{
return [[OFMutableArray alloc] initWithArray: self];
}
- (id)objectAtIndex: (size_t)index
{
return *((id*)[array itemAtIndex: index]);
}
|
| ︙ | ︙ |