ObjFW  Diff

Differences From Artifact [0727c1b670]:

To Artifact [65e0f02167]:


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
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







-
+


-
+









-
-
+
+


-
+


-
+


-
-
+
+

-
-
-
+
+
+




-
+












-
-
+
+








- (void)addObject: (id)object
{
	if (object == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	[array addItem: &object];
	[_array addItem: &object];
	[object retain];

	mutations++;
	_mutations++;
}

- (void)insertObject: (id)object
	     atIndex: (size_t)index
{
	if (object == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	[array insertItem: &object
		  atIndex: index];
	[_array insertItem: &object
		   atIndex: index];
	[object retain];

	mutations++;
	_mutations++;
}

- (void)insertObjectsFromArray: (OFArray*)array_
- (void)insertObjectsFromArray: (OFArray*)array
		       atIndex: (size_t)index
{
	id *objects = [array_ objects];
	size_t i, count = [array_ count];
	id *objects = [array objects];
	size_t i, count = [array count];

	[array insertItems: objects
		   atIndex: index
		     count: count];
	[_array insertItems: objects
		    atIndex: index
		      count: count];

	for (i = 0; i < count; i++)
		[objects[i] retain];

	mutations++;
	_mutations++;
}

- (void)replaceObject: (id)oldObject
	   withObject: (id)newObject
{
	id *objects;
	size_t i, count;

	if (oldObject == nil || newObject == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	objects = [array items];
	count = [array count];
	objects = [_array items];
	count = [_array count];

	for (i = 0; i < count; i++) {
		if ([objects[i] isEqual: oldObject]) {
			[newObject retain];
			[objects[i] release];
			objects[i] = newObject;

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
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







-
+

-
+

















-
-
+
+







	id *objects;
	id oldObject;

	if (object == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	objects = [array items];
	objects = [_array items];

	if (index >= [array count])
	if (index >= [_array count])
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	oldObject = objects[index];
	objects[index] = [object retain];
	[oldObject release];
}

- (void)replaceObjectIdenticalTo: (id)oldObject
		      withObject: (id)newObject
{
	id *objects;
	size_t i, count;

	if (oldObject == nil || newObject == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	objects = [array items];
	count = [array count];
	objects = [_array items];
	count = [_array count];

	for (i = 0; i < count; i++) {
		if (objects[i] == oldObject) {
			[newObject retain];
			[objects[i] release];
			objects[i] = newObject;

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
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
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
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
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
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







-
-
+
+





-
-
+
+

















-
-
+
+



-
-
+
+











-
+


-
+




-
-
+
+




-
+




-
-
+
+










-
-
+
+










-
+






-
+


-
+





-
-
+
+












-
-
+
+







	id *objects;
	size_t i, count;

	if (object == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	objects = [array items];
	count = [array count];
	objects = [_array items];
	count = [_array count];

	for (i = 0; i < count; i++) {
		if ([objects[i] isEqual: object]) {
			object = objects[i];

			[array removeItemAtIndex: i];
			mutations++;
			[_array removeItemAtIndex: i];
			_mutations++;

			[object release];

			return;
		}
	}
}

- (void)removeObjectIdenticalTo: (id)object
{
	id *objects;
	size_t i, count;

	if (object == nil)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]];

	objects = [array items];
	count = [array count];
	objects = [_array items];
	count = [_array count];

	for (i = 0; i < count; i++) {
		if (objects[i] == object) {
			[array removeItemAtIndex: i];
			mutations++;
			[_array removeItemAtIndex: i];
			_mutations++;

			[object release];

			return;
		}
	}
}

- (void)removeObjectAtIndex: (size_t)index
{
	id object = [self objectAtIndex: index];
	[array removeItemAtIndex: index];
	[_array removeItemAtIndex: index];
	[object release];

	mutations++;
	_mutations++;
}

- (void)removeAllObjects
{
	id *objects = [array items];
	size_t i, count = [array count];
	id *objects = [_array items];
	size_t i, count = [_array count];

	for (i = 0; i < count; i++)
		[objects[i] release];

	[array removeAllItems];
	[_array removeAllItems];
}

- (void)removeObjectsInRange: (of_range_t)range
{
	id *objects = [array items], *copy;
	size_t i, count = [array count];
	id *objects = [_array items], *copy;
	size_t i, count = [_array count];

	if (range.length > SIZE_MAX - range.location ||
	    range.length > count - range.location)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	copy = [self allocMemoryWithSize: sizeof(*copy)
				   count: range.length];
	memcpy(copy, objects + range.location, range.length * sizeof(id));

	@try {
		[array removeItemsInRange: range];
		mutations++;
		[_array removeItemsInRange: range];
		_mutations++;

		for (i = 0; i < range.length; i++)
			[copy[i] release];
	} @finally {
		[self freeMemory: copy];
	}
}

- (void)removeLastObject
{
	size_t count = [array count];
	size_t count = [_array count];
	id object;

	if (count == 0)
		return;

	object = [self objectAtIndex: count - 1];
	[array removeLastItem];
	[_array removeLastItem];
	[object release];

	mutations++;
	_mutations++;
}

- (void)exchangeObjectAtIndex: (size_t)index1
	    withObjectAtIndex: (size_t)index2
{
	id *objects = [array items];
	size_t count = [array count];
	id *objects = [_array items];
	size_t count = [_array count];
	id tmp;

	if (index1 >= count || index2 >= count)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	tmp = objects[index1];
	objects[index1] = objects[index2];
	objects[index2] = tmp;
}

- (void)reverse
{
	id *objects = [array items];
	size_t i, j, count = [array count];
	id *objects = [_array items];
	size_t i, j, count = [_array count];

	if (count == 0 || count == 1)
		return;

	for (i = 0, j = count - 1; i < j; i++, j--) {
		id tmp = objects[i];
		objects[i] = objects[j];
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

334
335
336
337
338

339
340
341
342
343
344
345
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
334
335
336
337

338
339
340
341
342
343
344
345







-
+








-
+





-
-
+
+

-
+


-
+










-
-
+
+

-
+




-
+







	 * does not reimplement it. As OFArray_adjacent does not reimplement it
	 * either, this is fine.
	 */
	int ret = [super countByEnumeratingWithState: state
					     objects: objects
					       count: count];

	state->mutationsPtr = &mutations;
	state->mutationsPtr = &_mutations;

	return ret;
}

- (OFEnumerator*)objectEnumerator
{
	return [[[OFArrayEnumerator alloc]
	    initWithArray: self
	     mutationsPtr: &mutations] autorelease];
	     mutationsPtr: &_mutations] autorelease];
}

#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
{
	id *objects = [array items];
	size_t i, count = [array count];
	id *objects = [_array items];
	size_t i, count = [_array count];
	BOOL stop = NO;
	unsigned long mutations_ = mutations;
	unsigned long mutations = _mutations;

	for (i = 0; i < count && !stop; i++) {
		if (mutations != mutations_)
		if (_mutations != mutations)
			@throw [OFEnumerationMutationException
			    exceptionWithClass: [self class]
					object: self];

		block(objects[i], i, &stop);
	}
}

- (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block
{
	id *objects = [array items];
	size_t i, count = [array count];
	id *objects = [_array items];
	size_t i, count = [_array count];
	BOOL stop = NO;
	unsigned long mutations_ = mutations;
	unsigned long mutations = _mutations;

	for (i = 0; i < count && !stop; i++) {
		id newObject;

		if (mutations != mutations_)
		if (_mutations != mutations)
			@throw [OFEnumerationMutationException
			    exceptionWithClass: [self class]
					object: self];

		newObject = block(objects[i], i, &stop);

		if (newObject == nil)