ObjFW  Diff

Differences From Artifact [2dc6749eb1]:

To Artifact [9dd77b8958]:


143
144
145
146
147
148
149

150
151
152
153
154
155
156
		[self dealloc];
		@throw e;
	}

	return self;
}


- initWithObjects: (OFArray*)objs
	  forKeys: (OFArray*)keys
{
	id *objs_carray, *keys_carray;
	size_t objs_count, i;
	const SEL sel = @selector(setObject:forKey:);
	IMP set = [OFMutableDictionary instanceMethodForSelector: sel];







>







143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
		[self dealloc];
		@throw e;
	}

	return self;
}

/* FIXME: Do it without resizing! */
- initWithObjects: (OFArray*)objs
	  forKeys: (OFArray*)keys
{
	id *objs_carray, *keys_carray;
	size_t objs_count, i;
	const SEL sel = @selector(setObject:forKey:);
	IMP set = [OFMutableDictionary instanceMethodForSelector: sel];
188
189
190
191
192
193
194

195
196
197
198
199
200
201
	ret = [self initWithKey: first
			argList: args];
	va_end(args);

	return ret;
}


- initWithKey: (OFObject <OFCopying>*)key
      argList: (va_list)args
{
	const SEL sel = @selector(setObject:forKey:);
	IMP set = [OFMutableDictionary instanceMethodForSelector: sel];

	self = [self init];







>







189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
	ret = [self initWithKey: first
			argList: args];
	va_end(args);

	return ret;
}

/* FIXME: Possible without resizing? */
- initWithKey: (OFObject <OFCopying>*)key
      argList: (va_list)args
{
	const SEL sel = @selector(setObject:forKey:);
	IMP set = [OFMutableDictionary instanceMethodForSelector: sel];

	self = [self init];