ObjFW  Diff

Differences From Artifact [9079ad9449]:

To Artifact [75ee6d9e19]:


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







+
+
+
+
+





-
+








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

-
+
-














-
+



-
+


















-
+

-
-
+


-
+





-
+

-
+

-
-
-
-
+
+
+

-
-
+
+

-
+

-
-
+
+




-
+


-
+

-
+

-
-
-
-
+
+
+

-
-
+
+

-
-
-
+
+
+




-
+


-
+
-

-
+

-
-
-
-
+
+
+

-
-
+
+

-
+

-
-
+
+




-
+


-
+
-

-
+

-
-
-
-
+
+
+

-
-
+
+

-
+

-
-
+
+




-
+


-
+

-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+




-
-
+
+




-
+




-
+










-
+












-
+
















-
-
+











-
-
+








-
+



-
-
+


-
+


-
+





-
-
-
-
+


-
+

-
-
-
-
+
+
+
+

-
-
+
+

-
+



-
+






-
+






-
+

-
+

-
-
-
+
+

-
+













-
+










-
+
-











-
+

-
+











-
+



-
+

-
+





-
+




-
+


-
-
+
+


-
+






-
+
-
-
+
+










-
+







#import "OFList.h"
#import "OFString.h"
#import "OFXMLElement.h"
#import "OFArray.h"

#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"

struct _OFListItem {
	struct _OFListItem *previous, *next;
	id object;
};

OF_DIRECT_MEMBERS
@interface OFListEnumerator: OFEnumerator
{
	OFList *_list;
	of_list_object_t *_Nullable _current;
	OFListItem _Nullable _current;
	unsigned long _mutations;
	unsigned long *_Nullable _mutationsPtr;
}

- (instancetype)initWithList: (OFList *)list
	    mutationsPointer: (unsigned long *)mutationsPtr;
@end

OFListItem
OFListItemNext(OFListItem listItem)
{
	return listItem->next;
}

OFListItem
OFListItemPrevious(OFListItem listItem)
{
	return listItem->previous;
}

id
OFListItemObject(OFListItem listItem)
{
	return listItem->object;
}

@implementation OFList
@synthesize firstListObject = _firstListObject;
@synthesize firstListItem = _firstListItem, lastListItem = _lastListItem;
@synthesize lastListObject = _lastListObject;

+ (instancetype)list
{
	return [[[self alloc] init] autorelease];
}

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

	@try {
		void *pool = objc_autoreleasePoolPush();

		if (![element.name isEqual: self.className] ||
		    ![element.namespace isEqual: OF_SERIALIZATION_NS])
		    ![element.namespace isEqual: OFSerializationNS])
			@throw [OFInvalidArgumentException exception];

		for (OFXMLElement *child in
		    [element elementsForNamespace: OF_SERIALIZATION_NS]) {
		    [element elementsForNamespace: OFSerializationNS]) {
			void *pool2 = objc_autoreleasePoolPush();

			[self appendObject: child.objectByDeserializing];

			objc_autoreleasePoolPop(pool2);
		}

		objc_autoreleasePoolPop(pool);
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (void)dealloc
{
	of_list_object_t *next;
	OFListItem next;

	for (of_list_object_t *iter = _firstListObject;
	    iter != NULL; iter = next) {
	for (OFListItem iter = _firstListItem; iter != NULL; iter = next) {
		[iter->object release];
		next = iter->next;
		free(iter);
		OFFreeMemory(iter);
	}

	[super dealloc];
}

- (of_list_object_t *)appendObject: (id)object
- (OFListItem)appendObject: (id)object
{
	of_list_object_t *listObject;
	OFListItem listItem = OFAllocMemory(1, sizeof(*listItem));

	listObject = of_alloc(1, sizeof(of_list_object_t));
	listObject->object = [object retain];
	listObject->next = NULL;
	listObject->previous = _lastListObject;
	listItem->object = [object retain];
	listItem->next = NULL;
	listItem->previous = _lastListItem;

	if (_lastListObject != NULL)
		_lastListObject->next = listObject;
	if (_lastListItem != NULL)
		_lastListItem->next = listItem;

	_lastListObject = listObject;
	_lastListItem = listItem;

	if (_firstListObject == NULL)
		_firstListObject = listObject;
	if (_firstListItem == NULL)
		_firstListItem = listItem;

	_count++;
	_mutations++;

	return listObject;
	return listItem;
}

- (of_list_object_t *)prependObject: (id)object
- (OFListItem)prependObject: (id)object
{
	of_list_object_t *listObject;
	OFListItem listItem = OFAllocMemory(1, sizeof(*listItem));

	listObject = of_alloc(1, sizeof(of_list_object_t));
	listObject->object = [object retain];
	listObject->next = _firstListObject;
	listObject->previous = NULL;
	listItem->object = [object retain];
	listItem->next = _firstListItem;
	listItem->previous = NULL;

	if (_firstListObject != NULL)
		_firstListObject->previous = listObject;
	if (_firstListItem != NULL)
		_firstListItem->previous = listItem;

	_firstListObject = listObject;
	if (_lastListObject == NULL)
		_lastListObject = listObject;
	_firstListItem = listItem;
	if (_lastListItem == NULL)
		_lastListItem = listItem;

	_count++;
	_mutations++;

	return listObject;
	return listItem;
}

- (of_list_object_t *)insertObject: (id)object
- (OFListItem)insertObject: (id)object beforeListItem: (OFListItem)listItem
		  beforeListObject: (of_list_object_t *)listObject
{
	of_list_object_t *newListObject;
	OFListItem newListItem = OFAllocMemory(1, sizeof(*newListItem));

	newListObject = of_alloc(1, sizeof(of_list_object_t));
	newListObject->object = [object retain];
	newListObject->next = listObject;
	newListObject->previous = listObject->previous;
	newListItem->object = [object retain];
	newListItem->next = listItem;
	newListItem->previous = listItem->previous;

	if (listObject->previous != NULL)
		listObject->previous->next = newListObject;
	if (listItem->previous != NULL)
		listItem->previous->next = newListItem;

	listObject->previous = newListObject;
	listItem->previous = newListItem;

	if (listObject == _firstListObject)
		_firstListObject = newListObject;
	if (listItem == _firstListItem)
		_firstListItem = newListItem;

	_count++;
	_mutations++;

	return newListObject;
	return newListItem;
}

- (of_list_object_t *)insertObject: (id)object
- (OFListItem)insertObject: (id)object afterListItem: (OFListItem)listItem
		   afterListObject: (of_list_object_t *)listObject
{
	of_list_object_t *newListObject;
	OFListItem newListItem = OFAllocMemory(1, sizeof(*newListItem));

	newListObject = of_alloc(1, sizeof(of_list_object_t));
	newListObject->object = [object retain];
	newListObject->next = listObject->next;
	newListObject->previous = listObject;
	newListItem->object = [object retain];
	newListItem->next = listItem->next;
	newListItem->previous = listItem;

	if (listObject->next != NULL)
		listObject->next->previous = newListObject;
	if (listItem->next != NULL)
		listItem->next->previous = newListItem;

	listObject->next = newListObject;
	listItem->next = newListItem;

	if (listObject == _lastListObject)
		_lastListObject = newListObject;
	if (listItem == _lastListItem)
		_lastListItem = newListItem;

	_count++;
	_mutations++;

	return newListObject;
	return newListItem;
}

- (void)removeListObject: (of_list_object_t *)listObject
- (void)removeListItem: (OFListItem)listItem
{
	if (listObject->previous != NULL)
		listObject->previous->next = listObject->next;
	if (listObject->next != NULL)
		listObject->next->previous = listObject->previous;
	if (listItem->previous != NULL)
		listItem->previous->next = listItem->next;
	if (listItem->next != NULL)
		listItem->next->previous = listItem->previous;

	if (_firstListObject == listObject)
		_firstListObject = listObject->next;
	if (_lastListObject == listObject)
		_lastListObject = listObject->previous;
	if (_firstListItem == listItem)
		_firstListItem = listItem->next;
	if (_lastListItem == listItem)
		_lastListItem = listItem->previous;

	_count--;
	_mutations++;

	[listObject->object release];
	free(listObject);
	[listItem->object release];
	OFFreeMemory(listItem);
}

- (id)firstObject
{
	return (_firstListObject != NULL ? _firstListObject->object : nil);
	return (_firstListItem != NULL ? _firstListItem->object : nil);
}

- (id)lastObject
{
	return (_lastListObject != NULL ? _lastListObject->object : nil);
	return (_lastListItem != NULL ? _lastListItem->object : nil);
}

- (size_t)count
{
	return _count;
}

- (bool)isEqual: (id)object
{
	OFList *list;
	of_list_object_t *iter, *iter2;
	OFListItem iter, iter2;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFList class]])
		return false;

	list = object;

	if (list.count != _count)
		return false;

	for (iter = _firstListObject, iter2 = list.firstListObject;
	for (iter = _firstListItem, iter2 = list.firstListItem;
	    iter != NULL && iter2 != NULL;
	    iter = iter->next, iter2 = iter2->next)
		if (![iter->object isEqual: iter2->object])
			return false;

	/* One is bigger than the other even though we checked the count */
	assert(iter == NULL && iter2 == NULL);

	return true;
}

- (bool)containsObject: (id)object
{
	if (_count == 0)
		return false;

	for (of_list_object_t *iter = _firstListObject;
	    iter != NULL; iter = iter->next)
	for (OFListItem iter = _firstListItem; iter != NULL; iter = iter->next)
		if ([iter->object isEqual: object])
			return true;

	return false;
}

- (bool)containsObjectIdenticalTo: (id)object
{
	if (_count == 0)
		return false;

	for (of_list_object_t *iter = _firstListObject;
	    iter != NULL; iter = iter->next)
	for (OFListItem iter = _firstListItem; iter != NULL; iter = iter->next)
		if (iter->object == object)
			return true;

	return false;
}

- (void)removeAllObjects
{
	of_list_object_t *next;
	OFListItem next;

	_mutations++;

	for (of_list_object_t *iter = _firstListObject;
	    iter != NULL; iter = next) {
	for (OFListItem iter = _firstListItem; iter != NULL; iter = next) {
		[iter->object release];
		next = iter->next;
		free(iter);
		OFFreeMemory(iter);
	}

	_firstListObject = _lastListObject = NULL;
	_firstListItem = _lastListItem = NULL;
}

- (id)copy
{
	OFList *copy = [[[self class] alloc] init];
	of_list_object_t *listObject, *previous;

	listObject = NULL;
	previous = NULL;
	OFListItem listItem = NULL, previous = NULL;

	@try {
		for (of_list_object_t *iter = _firstListObject;
		for (OFListItem iter = _firstListItem;
		    iter != NULL; iter = iter->next) {
			listObject = of_alloc(1, sizeof(of_list_object_t));
			listObject->object = [iter->object retain];
			listObject->next = NULL;
			listObject->previous = previous;
			listItem = OFAllocMemory(1, sizeof(*listItem));
			listItem->object = [iter->object retain];
			listItem->next = NULL;
			listItem->previous = previous;

			if (copy->_firstListObject == NULL)
				copy->_firstListObject = listObject;
			if (copy->_firstListItem == NULL)
				copy->_firstListItem = listItem;
			if (previous != NULL)
				previous->next = listObject;
				previous->next = listItem;

			copy->_count++;

			previous = listObject;
			previous = listItem;
		}
	} @catch (id e) {
		[copy release];
		@throw e;
	}

	copy->_lastListObject = listObject;
	copy->_lastListItem = listItem;

	return copy;
}

- (unsigned long)hash
{
	uint32_t hash;
	unsigned long hash;

	OF_HASH_INIT(hash);
	OFHashInit(&hash);

	for (of_list_object_t *iter = _firstListObject;
	    iter != NULL; iter = iter->next)
		OF_HASH_ADD_HASH(hash, [iter->object hash]);
	for (OFListItem iter = _firstListItem; iter != NULL; iter = iter->next)
		OFHashAddHash(&hash, [iter->object hash]);

	OF_HASH_FINALIZE(hash);
	OFHashFinalize(&hash);

	return hash;
}

- (OFString *)description
{
	OFMutableString *ret;

	if (_count == 0)
		return @"[]";

	ret = [OFMutableString stringWithString: @"[\n"];

	for (of_list_object_t *iter = _firstListObject;
	for (OFListItem iter = _firstListItem;
	    iter != NULL; iter = iter->next) {
		void *pool = objc_autoreleasePoolPush();

		[ret appendString: [iter->object description]];

		if (iter->next != NULL)
			[ret appendString: @",\n"];

		objc_autoreleasePoolPop(pool);
	}
	[ret replaceOccurrencesOfString: @"\n"
	[ret replaceOccurrencesOfString: @"\n" withString: @"\n\t"];
			     withString: @"\n\t"];
	[ret appendString: @"\n]"];

	[ret makeImmutable];

	return ret;
}

- (OFXMLElement *)XMLElementBySerializing
{
	OFXMLElement *element =
	    [OFXMLElement elementWithName: self.className
				namespace: OF_SERIALIZATION_NS];
				namespace: OFSerializationNS];

	for (of_list_object_t *iter = _firstListObject;
	for (OFListItem iter = _firstListItem;
	    iter != NULL; iter = iter->next) {
		void *pool = objc_autoreleasePoolPush();

		[element addChild: [iter->object XMLElementBySerializing]];

		objc_autoreleasePoolPop(pool);
	}

	return element;
}

- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
- (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
			   objects: (id *)objects
			     count: (int)count
{
	of_list_object_t *listObject;
	OFListItem listItem;

	memcpy(&listObject, state->extra, sizeof(listObject));
	memcpy(&listItem, state->extra, sizeof(listItem));

	state->itemsPtr = objects;
	state->mutationsPtr = &_mutations;

	if (state->state == 0) {
		listObject = _firstListObject;
		listItem = _firstListItem;
		state->state = 1;
	}

	for (int i = 0; i < count; i++) {
		if (listObject == NULL)
		if (listItem == NULL)
			return i;

		objects[i] = listObject->object;
		listObject = listObject->next;
		objects[i] = listItem->object;
		listItem = listItem->next;
	}

	memcpy(state->extra, &listObject, sizeof(listObject));
	memcpy(state->extra, &listItem, sizeof(listItem));

	return count;
}

- (OFEnumerator *)objectEnumerator
{
	return [[[OFListEnumerator alloc]
	return [[[OFListEnumerator alloc] initWithList: self
		initWithList: self
	    mutationsPointer: &_mutations] autorelease];
				      mutationsPointer: &_mutations]
	    autorelease];
}
@end

@implementation OFListEnumerator
- (instancetype)initWithList: (OFList *)list
	    mutationsPointer: (unsigned long *)mutationsPtr
{
	self = [super init];

	_list = [list retain];
	_current = _list.firstListObject;
	_current = _list.firstListItem;
	_mutations = *mutationsPtr;
	_mutationsPtr = mutationsPtr;

	return self;
}

- (void)dealloc