ObjFW  Diff

Differences From Artifact [1f143f64a7]:

To Artifact [409e6b7e60]:


15
16
17
18
19
20
21
22

23
24
25
26
27
28

29
30
31
32















































































33














34
35
36
37
38
39
40
15
16
17
18
19
20
21

22
23
24
25
26
27
28
29
30
31
32
33
34
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
97
98
99
100
101
102
103
104
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







-
+






+




+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+







 */

#include "config.h"

#include <stdarg.h>

#import "OFArray.h"
#import "OFDataArray.h"
#import "OFCArray.h"
#import "OFString.h"
#import "OFXMLElement.h"
#import "OFAutoreleasePool.h"

#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"
#import "OFNotImplementedException.h"
#import "OFOutOfRangeException.h"

#import "macros.h"

static struct {
	Class isa;
} placeholder;

@implementation OFArrayPlaceholder
- init
{
	return (id)[[OFCArray alloc] init];
}

- initWithObject: (id)object
{
	return (id)[[OFCArray alloc] initWithObject: object];
}

- initWithObjects: (id)firstObject, ...
{
	id ret;
	va_list arguments;

	va_start(arguments, firstObject);
	ret = [[OFCArray alloc] initWithObject: firstObject
				     arguments: arguments];
	va_end(arguments);

	return ret;
}

- initWithObject: (id)firstObject
       arguments: (va_list)arguments
{
	return (id)[[OFCArray alloc] initWithObject: firstObject
					  arguments: arguments];
}

- initWithArray: (OFArray*)array
{
	return (id)[[OFCArray alloc] initWithArray: array];
}

- initWithCArray: (id*)objects
{
	return (id)[[OFCArray alloc] initWithCArray: objects];
}

- initWithCArray: (id*)objects
	  length: (size_t)length
{
	return (id)[[OFCArray alloc] initWithCArray: objects
					     length: length];
}

- initWithSerialization: (OFXMLElement*)element
{
	return (id)[[OFCArray alloc] initWithSerialization: element];
}

- retain
{
	return self;
}

- autorelease
{
	return self;
}

- (void)release
{
}

- (void)dealloc
{
	@throw [OFNotImplementedException newWithClass: isa
					      selector: _cmd];
	[super dealloc];	/* Get rid of a stupid warning */
}
@end

@implementation OFArray
+ (void)initialize
{
	if (self == [OFArray class])
		placeholder.isa = [OFArrayPlaceholder class];
}

+ alloc
{
	if (self == [OFArray class])
		return (id)&placeholder;

	return [super alloc];
}

+ array
{
	return [[[self alloc] init] autorelease];
}

+ arrayWithObject: (id)object
{
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
97
98
99
100

101
102
103
104
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
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
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
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
339
340
341
342
343
344

345
346
347
348
349
350
351
352
353
354
355
356

357

358
359

360
361
362
363

364



365
366

367
368
369

370
371
372



373
374
375



376
377
378
379
380





381
382
383


384
385
386
387
388
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
425

426
427
428
429
430
431
432
433
434
435

436
437
438
439
440
441
442
443
444


445
446
447
448
449
450
451
452
453


454
455
456
457
458
459
460
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

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



341
342

343
344
345
346




347
348
349
350
351
352
353
354
355

356
357
358
359
360
361
362
363
364
365
366
367
368
369

370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388

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







-
-
-
-
-
-
-
-
-
-
-
-
-
-


-
-
-
-
-
-
-
-
-
-
-
+


















-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-


-
+

-
-
-
+
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-





-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-




-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
-
-

-
-
-
+
-
-
-
+
-
-
-
-
-
-
+
+
+

-
-
+
-
-
-
-
+
-
-
-
-
-
+
+
+
-
+
+




+
+
+
+
+
+
+
+
+
+
+
+
-
+














-
+
+




-
-
+

-
-
-

-
+







-
-
+

-
-
-

-
+







-
-
-
+
-
-
-
-
-
-
-
-




-
-
-
+
-
-
-
-
-
-
-
-




+
-
+

-
+




+
-
+
+
+

-
+


-
+
-

-
+
+
+

-
-
+
+
+

-
-
-
-
+
+
+
+
+
-
-
-
+
+
-




-
-
-
-
+
+
+
+





-
+





+
+
+





-
+
















+

-







-
+




-
-
-

-
+
+







-
-
+
+







+ arrayWithCArray: (id*)objects
	   length: (size_t)length
{
	return [[[self alloc] initWithCArray: objects
				      length: length] autorelease];
}

- init
{
	self = [super init];

	@try {
		array = [[OFDataArray alloc] initWithItemSize: sizeof(id)];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- initWithObject: (id)object
{
	self = [self init];

	@try {
		[array addItem: &object];
		[object retain];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
	return [self initWithObjects: object, nil];
}

- initWithObjects: (id)firstObject, ...
{
	id ret;
	va_list arguments;

	va_start(arguments, firstObject);
	ret = [self initWithObject: firstObject
			 arguments: arguments];
	va_end(arguments);

	return ret;
}

- initWithObject: (id)firstObject
       arguments: (va_list)arguments
{
	self = [self init];

	Class c = isa;
	@try {
		id object;

		[array addItem: &firstObject];
		[firstObject retain];

		while ((object = va_arg(arguments, id)) != nil) {
			[array addItem: &object];
			[object retain];
		}
	} @catch (id e) {
		[self release];
		@throw e;
	[self release];
	@throw [OFNotImplementedException newWithClass: c
	}

					      selector: _cmd];
	return self;
}

- initWithArray: (OFArray*)array_
- initWithArray: (OFArray*)array
{
	id *cArray;
	size_t i, count;

	Class c = isa;
	self = [self init];

	@try {
		cArray = [array_ cArray];
		count = [array_ count];
	} @catch (id e) {
		[self release];
		@throw e;
	[self release];
	@throw [OFNotImplementedException newWithClass: c
	}

					      selector: _cmd];
	@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;
}

- initWithCArray: (id*)objects
{
	self = [self init];

	Class c = isa;
	@try {
		id *object;
		size_t count = 0;

		for (object = objects; *object != nil; object++) {
			[*object retain];
			count++;
		}

		[array addNItems: count
		      fromCArray: objects];
	} @catch (id e) {
		id *object;

		for (object = objects; *object != nil; object++)
			[*object release];

		[self release];
		@throw e;
	[self release];
	@throw [OFNotImplementedException newWithClass: c
	}

					      selector: _cmd];
	return self;
}

- initWithCArray: (id*)objects
	  length: (size_t)length
{
	self = [self init];

	Class c = isa;
	@try {
		size_t i;

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

		[array addNItems: length
		      fromCArray: objects];
	} @catch (id e) {
		size_t i;

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

		[self release];
		@throw e;
	[self release];
	@throw [OFNotImplementedException newWithClass: c
	}

					      selector: _cmd];
	return self;
}

- initWithSerialization: (OFXMLElement*)element
{
	self = [self init];

	Class c = isa;
	@try {
		OFAutoreleasePool *pool, *pool2;
		OFEnumerator *enumerator;
		OFXMLElement *child;

	[self release];
		pool = [[OFAutoreleasePool alloc] init];

		if (![[element name] isEqual: [self className]] ||
		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
			@throw [OFInvalidArgumentException newWithClass: isa
							       selector: _cmd];

	@throw [OFNotImplementedException newWithClass: c
					      selector: _cmd];
}
		enumerator = [[element children] objectEnumerator];
		pool2 = [[OFAutoreleasePool alloc] init];

		while ((child = [enumerator nextObject]) != nil) {
			id object;

- (size_t)count
			if (![[child namespace] isEqual: OF_SERIALIZATION_NS])
				continue;

{
			object = [child objectByDeserializing];
			[array addItem: &object];
			[object retain];

			[pool2 releaseObjects];
		}
	@throw [OFNotImplementedException newWithClass: isa
					      selector: _cmd];
}

		[pool release];
	} @catch (id e) {
- (void)getObjects: (id*)buffer
		[self release];
		@throw e;
	}

	   inRange: (of_range_t)range
	return self;
}

- (size_t)count
{
{
	size_t i;

	return [array count];
	for (i = 0; i < range.length; i++)
		buffer[i] = [self objectAtIndex: range.start + i];
}

- (id*)cArray
{
	OFObject *container;
	size_t count;
	id *buffer;

	container = [[[OFObject alloc] init] autorelease];
	count = [self count];
	buffer = [container allocMemoryForNItems: [self count]
					withSize: sizeof(*buffer)];

	[self getObjects: buffer
		 inRange: of_range(0, count)];

	return [array cArray];
	return buffer;
}

- copy
{
	return [self retain];
}

- mutableCopy
{
	return [[OFMutableArray alloc] initWithArray: self];
}

- (id)objectAtIndex: (size_t)index
{
	return *((id*)[array itemAtIndex: index]);
	@throw [OFNotImplementedException newWithClass: isa
					      selector: _cmd];
}

- (size_t)indexOfObject: (id)object
{
	id *cArray = [array cArray];
	size_t i, count = [array count];
	size_t i, count = [self count];

	if (cArray == NULL)
		return OF_INVALID_INDEX;

	for (i = 0; i < count; i++)
		if ([cArray[i] isEqual: object])
		if ([[self objectAtIndex: i] isEqual: object])
			return i;

	return OF_INVALID_INDEX;
}

- (size_t)indexOfObjectIdenticalTo: (id)object
{
	id *cArray = [array cArray];
	size_t i, count = [array count];
	size_t i, count = [self count];

	if (cArray == NULL)
		return OF_INVALID_INDEX;

	for (i = 0; i < count; i++)
		if (cArray[i] == object)
		if ([self objectAtIndex: i] == object)
			return i;

	return OF_INVALID_INDEX;
}

- (BOOL)containsObject: (id)object
{
	id *cArray = [array cArray];
	size_t i, count = [array count];

	return ([self indexOfObject: object] != OF_INVALID_INDEX);
	if (cArray == NULL)
		return NO;

	for (i = 0; i < count; i++)
		if ([cArray[i] isEqual: object])
			return YES;

	return NO;
}

- (BOOL)containsObjectIdenticalTo: (id)object
{
	id *cArray = [array cArray];
	size_t i, count = [array count];

	return ([self indexOfObjectIdenticalTo: object] != OF_INVALID_INDEX);
	if (cArray == NULL)
		return NO;

	for (i = 0; i < count; i++)
		if (cArray[i] == object)
			return YES;

	return NO;
}

- (id)firstObject
{
	if ([self count] > 0)
	id *firstObject = [array firstItem];
		return [self objectAtIndex: 0];

	return (firstObject != NULL ? *firstObject : nil);
	return nil;
}

- (id)lastObject
{
	size_t count = [self count];
	id *lastObject = [array lastItem];

	if (count > 0)
		return [self objectAtIndex: count - 1];

	return (lastObject != NULL ? *lastObject : nil);
	return nil;
}

- (OFArray*)objectsFromIndex: (size_t)start
- (OFArray*)objectsInRange: (of_range_t)range
		     toIndex: (size_t)end
{
	size_t count = [array count];
	OFArray *ret;
	id *buffer = [self allocMemoryForNItems: range.length
				       withSize: sizeof(*buffer)];

	if (end > count || start > end)
		@throw [OFOutOfRangeException newWithClass: isa];
	@try {
		[self getObjects: buffer
			 inRange: range];

	return [OFArray arrayWithCArray: (id*)[array cArray] + start
				 length: end - start];
}

		ret = [OFArray arrayWithCArray: buffer
					length: range.length];
	} @finally {
		[self freeMemory: buffer];
	}
- (OFArray*)objectsInRange: (of_range_t)range
{
	return [self objectsFromIndex: range.start

	return ret;
			      toIndex: range.start + range.length];
}

- (OFString*)componentsJoinedByString: (OFString*)separator
{
	OFAutoreleasePool *pool;
	OFString *ret;
	OFObject **cArray = [array cArray];
	size_t i, count = [array count];
	OFAutoreleasePool *pool, *pool2;
	OFMutableString *ret;
	id *cArray;
	size_t i, count = [self count];
	IMP append;

	if (count == 0)
		return @"";
	if (count == 1)
		return [cArray[0] description];
		return [[self firstObject] description];

	ret = [OFMutableString string];
	append = [ret methodForSelector: @selector(appendString:)];

	pool = [[OFAutoreleasePool alloc] init];
	cArray = [self cArray];

	pool2 = [[OFAutoreleasePool alloc] init];

	for (i = 0; i < count - 1; i++) {
		append(ret, @selector(appendString:), [cArray[i] description]);
		append(ret, @selector(appendString:), separator);

		[pool releaseObjects];
		[pool2 releaseObjects];
	}
	append(ret, @selector(appendString:), [cArray[i] description]);

	[pool release];

	/*
	 * Class swizzle the array to be immutable. We declared the return type
	 * to be OFArray*, so it can't be modified anyway. But not swizzling it
	 * would create a real copy each time -[copy] is called.
	 */
	ret->isa = [OFString class];
	return ret;
}

- (BOOL)isEqual: (id)object
{
	/* FIXME: Optimize (for example, buffer of 16 for each) */
	OFArray *otherArray;
	id *cArray, *otherCArray;
	size_t i, count;

	if (![object isKindOfClass: [OFArray class]])
		return NO;

	otherArray = object;

	count = [array count];
	count = [self count];

	if (count != [otherArray count])
		return NO;

	cArray = [array cArray];
	otherCArray = [otherArray cArray];

	for (i = 0; i < count; i++)
		if (![cArray[i] isEqual: otherCArray[i]])
		if (![[self objectAtIndex: i] isEqual:
		    [otherArray objectAtIndex: i]])
			return NO;

	return YES;
}

- (uint32_t)hash
{
	id *cArray = [array cArray];
	size_t i, count = [array count];
	id *cArray = [self cArray];
	size_t i, count = [self count];
	uint32_t hash;

	OF_HASH_INIT(hash);

	for (i = 0; i < count; i++) {
		uint32_t h = [cArray[i] hash];

470
471
472
473
474
475
476
477

478
479
480
481
482
483
484
429
430
431
432
433
434
435

436
437
438
439
440
441
442
443







-
+







}

- (OFString*)description
{
	OFAutoreleasePool *pool;
	OFMutableString *ret;

	if ([array count] == 0)
	if ([self count] == 0)
		return @"()";

	pool = [[OFAutoreleasePool alloc] init];
	ret = [[self componentsJoinedByString: @",\n"] mutableCopy];

	@try {
		[ret prependString: @"(\n"];
504
505
506
507
508
509
510
511
512


513

514
515





516
517
518
519
520
521
522
463
464
465
466
467
468
469


470
471
472
473


474
475
476
477
478
479
480
481
482
483
484
485







-
-
+
+

+
-
-
+
+
+
+
+







}

- (OFXMLElement*)XMLElementBySerializing
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	OFAutoreleasePool *pool2;
	OFXMLElement *element;
	id <OFSerialization> *cArray = [array cArray];
	size_t i, count = [array count];
	id <OFSerialization> *cArray = [self cArray];
	size_t i, count = [self count];

	if ([self isKindOfClass: [OFMutableArray class]])
	element = [OFXMLElement elementWithName: [self className]
				      namespace: OF_SERIALIZATION_NS];
		element = [OFXMLElement elementWithName: @"OFMutableArray"
					      namespace: OF_SERIALIZATION_NS];
	else
		element = [OFXMLElement elementWithName: @"OFArray"
					      namespace: OF_SERIALIZATION_NS];

	pool2 = [[OFAutoreleasePool alloc] init];

	for (i = 0; i < count; i++) {
		[element addChild: [cArray[i] XMLElementBySerializing]];

		[pool2 releaseObjects];
530
531
532
533
534
535
536
537
538


539
540
541
542
543
544
545
546
547
548
549


550
551
552
553
554
555
556
557
558
559

560

561
562
563
564
565
566
567
568
569

570
571
572
573
574
575
576
577
578
579

580
581
582
583
584
585
586

587
588
589
590

591
592
593
594
595
596

597
598
599
600
601
602
603
493
494
495
496
497
498
499


500
501
502
503
504
505
506
507
508
509
510


511
512
513
514
515
516
517
518
519
520
521
522
523

524
525
526
527
528
529
530
531
532

533
534
535
536
537
538
539
540
541


542
543
544
545
546
547


548
549
550
551

552
553
554
555
556
557

558
559
560
561
562
563
564
565







-
-
+
+









-
-
+
+










+
-
+








-
+








-
-
+





-
-
+



-
+





-
+







	}

	return element;
}

- (void)makeObjectsPerformSelector: (SEL)selector
{
	id *cArray = [array cArray];
	size_t i, count = [array count];
	id *cArray = [self cArray];
	size_t i, count = [self count];

	for (i = 0; i < count; i++)
		((void(*)(id, SEL))[cArray[i]
		    methodForSelector: selector])(cArray[i], selector);
}

- (void)makeObjectsPerformSelector: (SEL)selector
			withObject: (id)object
{
	id *cArray = [array cArray];
	size_t i, count = [array count];
	id *cArray = [self cArray];
	size_t i, count = [self count];

	for (i = 0; i < count; i++)
		((void(*)(id, SEL, id))[cArray[i]
		    methodForSelector: selector])(cArray[i], selector, object);
}

- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
			   objects: (id*)objects
			     count: (int)count_
{
	/* FIXME: Use -[getObjects:inRange:] on the passed objects */
	size_t count = [array count];
	size_t count = [self count];

	if (count > INT_MAX)
		@throw [OFOutOfRangeException newWithClass: isa];

	if (state->state >= count)
		return 0;

	state->state = count;
	state->itemsPtr = [array cArray];
	state->itemsPtr = [self cArray];
	state->mutationsPtr = (unsigned long*)self;

	return (int)count;
}

- (OFEnumerator*)objectEnumerator
{
	return [[[OFArrayEnumerator alloc] initWithArray: self
					       dataArray: array
					mutationsPointer: NULL] autorelease];
					    mutationsPtr: NULL] autorelease];
}

#ifdef OF_HAVE_BLOCKS
- (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
{
	id *cArray = [array cArray];
	size_t i, count = [array count];
	size_t i, count = [self count];
	BOOL stop = NO;

	for (i = 0; i < count && !stop; i++)
		block(cArray[i], i, &stop);
		block([self objectAtIndex: i], i, &stop);
}

- (OFArray*)mappedArrayUsingBlock: (of_array_map_block_t)block
{
	OFArray *ret;
	size_t count = [array count];
	size_t count = [self count];
	id *tmp = [self allocMemoryForNItems: count
				    withSize: sizeof(id)];

	@try {
		[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
		    BOOL *stop) {
			tmp[index] = block(object, index);
611
612
613
614
615
616
617
618

619
620
621
622
623
624
625
573
574
575
576
577
578
579

580
581
582
583
584
585
586
587







-
+








	return ret;
}

- (OFArray*)filteredArrayUsingBlock: (of_array_filter_block_t)block
{
	OFArray *ret;
	size_t count = [array count];
	size_t count = [self count];
	id *tmp = [self allocMemoryForNItems: count
				    withSize: sizeof(id)];

	@try {
		__block size_t i = 0;

		[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
635
636
637
638
639
640
641
642

643
644
645
646
647
648
649
597
598
599
600
601
602
603

604
605
606
607
608
609
610
611







-
+







	}

	return ret;
}

- (id)foldUsingBlock: (of_array_fold_block_t)block
{
	size_t count = [array count];
	size_t count = [self count];
	__block id current;

	if (count == 0)
		return nil;
	if (count == 1)
		return [[[self firstObject] retain] autorelease];

663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686

687
688

689
690
691
692
693
694

695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716


717
718
719
720
721
722
723
724
725
726
727

728
729
625
626
627
628
629
630
631













632
633
634

635


636
637
638
639
640


641
642
643
644
645
646
647
648
649
650

651
652
653
654
655
656
657
658
659
660


661
662
663
664
665
666
667
668
669
670
671
672

673
674
675







-
-
-
-
-
-
-
-
-
-
-
-
-



-
+
-
-
+




-
-
+









-










-
-
+
+










-
+


		}
		current = new;
	}];

	return [current autorelease];
}
#endif

- (void)dealloc
{
	id *cArray = [array cArray];
	size_t i, count = [array count];

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

	[array release];

	[super dealloc];
}
@end

@implementation OFArrayEnumerator
-    initWithArray: (OFArray*)array_
- initWithArray: (OFArray*)array_
	 dataArray: (OFDataArray*)dataArray_
  mutationsPointer: (unsigned long*)mutationsPtr_
   mutationsPtr: (unsigned long*)mutationsPtr_
{
	self = [super init];

	array = [array_ retain];
	dataArray = [dataArray_ retain];
	count = [dataArray count];
	count = [array count];
	mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0);
	mutationsPtr = mutationsPtr_;

	return self;
}

- (void)dealloc
{
	[array release];
	[dataArray release];

	[super dealloc];
}

- (id)nextObject
{
	if (mutationsPtr != NULL && *mutationsPtr != mutations)
		@throw [OFEnumerationMutationException newWithClass: isa
							     object: array];

	if (pos < count)
		return *(id*)[dataArray itemAtIndex: pos++];
	if (position < count)
		return [array objectAtIndex: position++];

	return nil;
}

- (void)reset
{
	if (mutationsPtr != NULL && *mutationsPtr != mutations)
		@throw [OFEnumerationMutationException newWithClass: isa
							     object: array];

	pos = 0;
	position = 0;
}
@end