Differences From Artifact [29eff2abae]:
- File
src/OFDictionary.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: 11891) [annotate] [blame] [check-ins using]
To Artifact [150bd32bb7]:
- File src/OFDictionary.m — part of check-in [d42a56787b] at 2012-03-12 12:14:32 on branch trunk — Add +[OFDictionary dictionaryWithObjects:forKeys:count:]. (user: js, size: 12492) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
- initWithObjects: (OFArray*)objects
forKeys: (OFArray*)keys
{
return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects
forKeys: keys];
}
- initWithKeysAndObjects: (id <OFCopying>)firstKey, ...
{
id ret;
va_list arguments;
va_start(arguments, firstKey);
| > > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 |
- initWithObjects: (OFArray*)objects
forKeys: (OFArray*)keys
{
return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects
forKeys: keys];
}
- initWithObjects: (id*)objects
forKeys: (id*)keys
count: (size_t)count
{
return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects
forKeys: keys
count: count];
}
- initWithKeysAndObjects: (id <OFCopying>)firstKey, ...
{
id ret;
va_list arguments;
va_start(arguments, firstKey);
|
| ︙ | ︙ | |||
142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
+ dictionaryWithObjects: (OFArray*)objects
forKeys: (OFArray*)keys
{
return [[[self alloc] initWithObjects: objects
forKeys: keys] autorelease];
}
+ dictionaryWithKeysAndObjects: (id)firstKey, ...
{
id ret;
va_list arguments;
va_start(arguments, firstKey);
| > > > > > > > > > | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 |
+ dictionaryWithObjects: (OFArray*)objects
forKeys: (OFArray*)keys
{
return [[[self alloc] initWithObjects: objects
forKeys: keys] autorelease];
}
+ dictionaryWithObjects: (id*)objects
forKeys: (id*)keys
count: (size_t)count
{
return [[[self alloc] initWithObjects: objects
forKeys: keys
count: count] autorelease];
}
+ dictionaryWithKeysAndObjects: (id)firstKey, ...
{
id ret;
va_list arguments;
va_start(arguments, firstKey);
|
| ︙ | ︙ | |||
185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
{
return [self initWithKeysAndObjects: key, object, nil];
}
- initWithObjects: (OFArray*)objects
forKeys: (OFArray*)keys
{
Class c = isa;
[self release];
@throw [OFNotImplementedException exceptionWithClass: c
selector: _cmd];
}
- initWithKeysAndObjects: (id)firstKey, ...
| > > > > > > > > > > | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 |
{
return [self initWithKeysAndObjects: key, object, nil];
}
- initWithObjects: (OFArray*)objects
forKeys: (OFArray*)keys
{
Class c = isa;
[self release];
@throw [OFNotImplementedException exceptionWithClass: c
selector: _cmd];
}
- initWithObjects: (id*)objects
forKeys: (id*)keys
count: (size_t)count
{
Class c = isa;
[self release];
@throw [OFNotImplementedException exceptionWithClass: c
selector: _cmd];
}
- initWithKeysAndObjects: (id)firstKey, ...
|
| ︙ | ︙ |