ObjFW  Diff

Differences From Artifact [78bab359a3]:

To Artifact [72ac5c5c33]:


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
334
335
336
337
338
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







-
+
-




-
+
-


-
+
-




-
+
-




-
+
-


-
+
-




-
-
+

-
+
-


-
+
-










-
+
-





-
+
-










-
+
-







- (id)copy
{
	return [[OFArray alloc] initWithArray: self];
}

- (void)addObject: (id)object
{
	[self insertObject: object
	[self insertObject: object atIndex: self.count];
		   atIndex: self.count];
}

- (void)addObjectsFromArray: (OFArray *)array
{
	[self insertObjectsFromArray: array
	[self insertObjectsFromArray: array atIndex: self.count];
			     atIndex: self.count];
}

- (void)insertObject: (id)object
- (void)insertObject: (id)object atIndex: (size_t)idx
	     atIndex: (size_t)idx
{
	OF_UNRECOGNIZED_SELECTOR
}

- (void)insertObjectsFromArray: (OFArray *)array
- (void)insertObjectsFromArray: (OFArray *)array atIndex: (size_t)idx
		       atIndex: (size_t)idx
{
	size_t i = 0;

	for (id object in array)
		[self insertObject: object
		[self insertObject: object atIndex: idx + i++];
			   atIndex: idx + i++];
}

- (void)replaceObjectAtIndex: (size_t)idx
- (void)replaceObjectAtIndex: (size_t)idx withObject: (id)object
		  withObject: (id)object
{
	OF_UNRECOGNIZED_SELECTOR
}

-    (void)setObject: (id)object
  atIndexedSubscript: (size_t)idx
- (void)setObject: (id)object atIndexedSubscript: (size_t)idx
{
	[self replaceObjectAtIndex: idx
	[self replaceObjectAtIndex: idx withObject: object];
			withObject: object];
}

- (void)replaceObject: (id)oldObject
- (void)replaceObject: (id)oldObject withObject: (id)newObject
	   withObject: (id)newObject
{
	size_t count;

	if (oldObject == nil || newObject == nil)
		@throw [OFInvalidArgumentException exception];

	count = self.count;

	for (size_t i = 0; i < count; i++) {
		if ([[self objectAtIndex: i] isEqual: oldObject]) {
			[self replaceObjectAtIndex: i
			[self replaceObjectAtIndex: i withObject: newObject];
					withObject: newObject];
			return;
		}
	}
}

- (void)replaceObjectIdenticalTo: (id)oldObject
- (void)replaceObjectIdenticalTo: (id)oldObject withObject: (id)newObject
		      withObject: (id)newObject
{
	size_t count;

	if (oldObject == nil || newObject == nil)
		@throw [OFInvalidArgumentException exception];

	count = self.count;

	for (size_t i = 0; i < count; i++) {
		if ([self objectAtIndex: i] == oldObject) {
			[self replaceObjectAtIndex: i
			[self replaceObjectAtIndex: i withObject: newObject];
					withObject: newObject];

			return;
		}
	}
}

- (void)removeObjectAtIndex: (size_t)idx
401
402
403
404
405
406
407
408

409
410
411
412
413
414

415
416
417
418
419
420
421
422

423
424

425
426
427
428
429
430
431
432
433

434
435
436
437
438
439
440
441
389
390
391
392
393
394
395

396

397
398
399
400

401

402
403
404
405
406
407

408


409

410
411
412
413
414
415
416

417

418
419
420
421
422
423
424







-
+
-




-
+
-






-
+
-
-
+
-







-
+
-







- (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block
{
	[self enumerateObjectsUsingBlock: ^ (id object, size_t idx,
	    bool *stop) {
		id new = block(object, idx);

		if (new != object)
			[self replaceObjectAtIndex: idx
			[self replaceObjectAtIndex: idx withObject: new];
					withObject: new];
	}];
}
#endif

- (void)exchangeObjectAtIndex: (size_t)idx1
- (void)exchangeObjectAtIndex: (size_t)idx1 withObjectAtIndex: (size_t)idx2
	    withObjectAtIndex: (size_t)idx2
{
	id object1 = [self objectAtIndex: idx1];
	id object2 = [self objectAtIndex: idx2];

	[object1 retain];
	@try {
		[self replaceObjectAtIndex: idx1
		[self replaceObjectAtIndex: idx1 withObject: object2];
				withObject: object2];
		[self replaceObjectAtIndex: idx2
		[self replaceObjectAtIndex: idx2 withObject: object1];
				withObject: object1];
	} @finally {
		[object1 release];
	}
}

- (void)sort
{
	[self sortUsingSelector: @selector(compare:)
	[self sortUsingSelector: @selector(compare:) options: 0];
			options: 0];
}

- (void)sortUsingSelector: (SEL)selector
		  options: (int)options
{
	size_t count = self.count;

462
463
464
465
466
467
468
469

470
471
472
473
474
475
476
445
446
447
448
449
450
451

452

453
454
455
456
457
458







-
+
-






{
	size_t i, j, count = self.count;

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

	for (i = 0, j = count - 1; i < j; i++, j--)
		[self exchangeObjectAtIndex: i
		[self exchangeObjectAtIndex: i withObjectAtIndex: j];
			  withObjectAtIndex: j];
}

- (void)makeImmutable
{
}
@end