ObjFW  Check-in [cb0fd980f9]

Overview
Comment:Make more use of fast enumeration
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: cb0fd980f9d91352a8e1b58e316c89433855382abce7d68e4393db143e30cb99
User & Date: js on 2016-01-03 01:14:27
Other Links: manifest | tags
Context
2016-01-05
14:10
Better randomization of HTTP header order check-in: 58d4025602 user: js tags: trunk
2016-01-03
01:14
Make more use of fast enumeration check-in: cb0fd980f9 user: js tags: trunk
00:41
Update copyright check-in: 2a27cf3000 user: js tags: trunk
Changes

Modified src/OFArray.m from [55b9badbf0] to [20c7045513].

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







-
+




-
-
+
-
-
+

+
+
+






-
+




-
-
+
-
-
+

+
+
+







- (id)objectAtIndexedSubscript: (size_t)index
{
	return [self objectAtIndex: index];
}

- (size_t)indexOfObject: (id)object
{
	size_t i, count;
	size_t i = 0;

	if (object == nil)
		return OF_NOT_FOUND;

	count = [self count];

	for (id objectIter in self) {
	for (i = 0; i < count; i++)
		if ([[self objectAtIndex: i] isEqual: object])
		if ([objectIter isEqual: object])
			return i;

		i++;
	}

	return OF_NOT_FOUND;
}

- (size_t)indexOfObjectIdenticalTo: (id)object
{
	size_t i, count;
	size_t i = 0;

	if (object == nil)
		return OF_NOT_FOUND;

	count = [self count];

	for (id objectIter in self) {
	for (i = 0; i < count; i++)
		if ([self objectAtIndex: i] == object)
		if (objectIter == object)
			return i;

		i++;
	}

	return OF_NOT_FOUND;
}

- (bool)containsObject: (id)object
{
	return ([self indexOfObject: object] != OF_NOT_FOUND);
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
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







-

-
-




-
+
-
-

-
+




-
-
-

-
-
+
+

-
+







-
+


-
-
+
+

+
-
+
-
-
+

-
+

-



-
-







				      options: 0];
}

- (OFString*)componentsJoinedByString: (OFString*)separator
			usingSelector: (SEL)selector
			      options: (int)options
{
	void *pool;
	OFMutableString *ret;
	id const *objects;
	size_t i, count;

	if (separator == nil)
		@throw [OFInvalidArgumentException exception];

	count = [self count];
	if ([self count] == 0)

	if (count == 0)
		return @"";
	if (count == 1)
	if ([self count] == 1)
		return [[self firstObject] performSelector: selector];

	ret = [OFMutableString string];

	pool = objc_autoreleasePoolPush();
	objects = [self objects];

	if (options & OF_ARRAY_SKIP_EMPTY) {
		for (i = 0; i < count; i++) {
			void *pool2 = objc_autoreleasePoolPush();
		for (id object in self) {
			void *pool = objc_autoreleasePoolPush();
			OFString *component =
			    [objects[i] performSelector: selector];
			    [object performSelector: selector];

			if ([component length] > 0) {
				if ([ret length] > 0)
					[ret appendString: separator];
				[ret appendString: component];
			}

			objc_autoreleasePoolPop(pool2);
			objc_autoreleasePoolPop(pool);
		}
	} else {
		for (i = 0; i < count - 1; i++) {
			void *pool2 = objc_autoreleasePoolPush();
		for (id object in self) {
			void *pool = objc_autoreleasePoolPush();

			if ([ret length] > 0)
			[ret appendString:
				[ret appendString: separator];
			    [objects[i] performSelector: selector]];
			[ret appendString: separator];
			[ret appendString: [object performSelector: selector]];

			objc_autoreleasePoolPop(pool2);
			objc_autoreleasePoolPop(pool);
		}
		[ret appendString: [objects[i] performSelector: selector]];
	}

	[ret makeImmutable];

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (bool)isEqual: (id)object
{
	/* FIXME: Optimize (for example, buffer of 16 for each) */
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483


484
485
486
487
488
489
490
460
461
462
463
464
465
466


467
468
469
470


471
472
473
474
475
476
477
478
479







-
-




-
-
+
+







			return false;

	return true;
}

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

	OF_HASH_INIT(hash);

	for (i = 0; i < count; i++)
		OF_HASH_ADD_HASH(hash, [objects[i] hash]);
	for (id object in self)
		OF_HASH_ADD_HASH(hash, [object hash]);

	OF_HASH_FINALIZE(hash);

	return hash;
}

- (OFString*)description
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
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







-
-








-
+


-
+







	return [ret autorelease];
}

- (OFXMLElement*)XMLElementBySerializing
{
	void *pool = objc_autoreleasePoolPush();
	OFXMLElement *element;
	id <OFSerialization> const *objects = [self objects];
	size_t i, count = [self count];

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

	for (i = 0; i < count; i++) {
	for (id object in self) {
		void *pool2 = objc_autoreleasePoolPush();

		[element addChild: [objects[i] XMLElementBySerializing]];
		[element addChild: [object XMLElementBySerializing]];

		objc_autoreleasePoolPop(pool2);
	}

	[element retain];

	objc_autoreleasePoolPop(pool);
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
651
652
653
654
655
656
657



658


659
660
661
662
663
664



665



666
667
668
669
670
671
672
673
674







-
-
-
+
-
-
+





-
-
-
+
-
-
-
+
+







	objc_autoreleasePoolPop(pool);

	return data;
}

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

	for (id object in self)
	for (i = 0; i < count; i++)
		[objects[i] performSelector: selector];
		[object performSelector: selector];
}

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

	for (id object in self)
	for (i = 0; i < count; i++)
		[objects[i] performSelector: selector
				 withObject: object];
		[object performSelector: selector
			     withObject: object];
}

- (OFArray*)sortedArray
{
	OFMutableArray *new = [[self mutableCopy] autorelease];

	[new sort];

Modified src/OFKernelEventObserver.m from [39f30ed249] to [5d44afb3d5].

213
214
215
216
217
218
219
220
221

222
223
224
225
226
227
228



229
230
231

232
233
234
235
236
213
214
215
216
217
218
219


220


221
222



223
224
225
226
227

228
229
230
231
232
233







-
-
+
-
-


-
-
-
+
+
+


-
+





	    (struct sockaddr*)&_cancelAddr, 8) > 0);
# endif
#endif
}

- (void)OF_processReadBuffers
{
	id const *objects = [_readObjects objects];
	size_t i, count = [_readObjects count];
	for (id object in _readObjects) {

	for (i = 0; i < count; i++) {
		void *pool = objc_autoreleasePoolPush();

		if ([objects[i] isKindOfClass: [OFStream class]] &&
		    [objects[i] hasDataInReadBuffer] &&
		    ![objects[i] OF_isWaitingForDelimiter] &&
		if ([object isKindOfClass: [OFStream class]] &&
		    [object hasDataInReadBuffer] &&
		    ![object OF_isWaitingForDelimiter] &&
		    [_delegate respondsToSelector:
		    @selector(objectIsReadyForReading:)])
			[_delegate objectIsReadyForReading: objects[i]];
			[_delegate objectIsReadyForReading: object];

		objc_autoreleasePoolPop(pool);
	}
}
@end

Modified src/OFXMLElement.m from [2b05f04b14] to [1b3b42ec8f].

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
397
398
399
400
401
402
403


404

405
406
407
408

409

410
411
412

413
414
415
416
417
418
419
420







-
-

-
+



-

-
+


-
+








	objc_autoreleasePoolPop(pool);
}

- (OFString*)stringValue
{
	OFMutableString *ret;
	OFXMLNode *const *objects;
	size_t i, count = [_children count];

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

	ret = [OFMutableString string];
	objects = [_children objects];

	for (i = 0; i < count; i++) {
	for (OFXMLNode *child in _children) {
		void *pool = objc_autoreleasePoolPush();

		[ret appendString: [objects[i] stringValue]];
		[ret appendString: [child stringValue]];

		objc_autoreleasePoolPop(pool);
	}

	[ret makeImmutable];

	return ret;
797
798
799
800
801
802
803
804
805
806

807
808
809
810



811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826

827
828
829
830



831
832
833
834
835
836
837
794
795
796
797
798
799
800



801




802
803
804
805
806
807
808
809
810
811



812
813
814



815




816
817
818
819
820
821
822
823
824
825







-
-
-
+
-
-
-
-
+
+
+







-
-
-



-
-
-
+
-
-
-
-
+
+
+







						  stringValue: stringValue]];

	objc_autoreleasePoolPop(pool);
}

- (OFXMLAttribute*)attributeForName: (OFString*)attributeName
{
	OFXMLAttribute *const *objects = [_attributes objects];
	size_t i, count = [_attributes count];

	for (OFXMLAttribute *attribute in _attributes)
	for (i = 0; i < count; i++)
		if (objects[i]->_namespace == nil &&
		    [objects[i]->_name isEqual: attributeName])
			return [[objects[i] retain] autorelease];
		if (attribute->_namespace == nil &&
		    [attribute->_name isEqual: attributeName])
			return [[attribute retain] autorelease];

	return nil;
}

- (OFXMLAttribute*)attributeForName: (OFString*)attributeName
			  namespace: (OFString*)attributeNS
{
	OFXMLAttribute *const *objects;
	size_t i, count;

	if (attributeNS == nil)
		return [self attributeForName: attributeName];

	objects = [_attributes objects];
	count = [_attributes count];

	for (OFXMLAttribute *attribute in _attributes)
	for (i = 0; i < count; i++)
		if ([objects[i]->_namespace isEqual: attributeNS] &&
		    [objects[i]->_name isEqual: attributeName])
			return [[objects[i] retain] autorelease];
		if ([attribute->_namespace isEqual: attributeNS] &&
		    [attribute->_name isEqual: attributeName])
			return [[attribute retain] autorelease];

	return nil;
}

- (void)removeAttributeForName: (OFString*)attributeName
{
	OFXMLAttribute *const *objects = [_attributes objects];
972
973
974
975
976
977
978
979
980
981
982
983
984



985
986
987
988
989
990
991
992
993
994
995
996
997
998
999



1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020



1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049



1050
1051
1052
1053
1054
1055
1056
960
961
962
963
964
965
966


967



968
969
970
971
972
973
974
975
976
977
978
979


980



981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998


999



1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018


1019
1020
1021
1022
1023


1024



1025
1026
1027
1028
1029
1030
1031
1032
1033
1034







-
-

-
-
-
+
+
+









-
-

-
-
-
+
+
+















-
-

-
-
-
+
+
+
















-
-





-
-

-
-
-
+
+
+







	return [[self elementsForName: elementName
			    namespace: elementNS] firstObject];
}

- (OFArray*)elements
{
	OFMutableArray OF_GENERIC(OFXMLElement*) *ret = [OFMutableArray array];
	OFXMLNode *const *objects = [_children objects];
	size_t i, count = [_children count];

	for (i = 0; i < count; i++)
		if ([objects[i] isKindOfClass: [OFXMLElement class]])
			[ret addObject: (OFXMLElement*)objects[i]];
	for (OFXMLNode *child in _children)
		if ([child isKindOfClass: [OFXMLElement class]])
			[ret addObject: (OFXMLElement*)child];

	[ret makeImmutable];

	return ret;
}

- (OFArray*)elementsForName: (OFString*)elementName
{
	OFMutableArray OF_GENERIC(OFXMLElement*) *ret = [OFMutableArray array];
	OFXMLNode *const *objects = [_children objects];
	size_t i, count = [_children count];

	for (i = 0; i < count; i++) {
		if ([objects[i] isKindOfClass: [OFXMLElement class]]) {
			OFXMLElement *element = (OFXMLElement*)objects[i];
	for (OFXMLNode *child in _children) {
		if ([child isKindOfClass: [OFXMLElement class]]) {
			OFXMLElement *element = (OFXMLElement*)child;

			if (element->_namespace == nil &&
			    [element->_name isEqual: elementName])
				[ret addObject: element];
		}
	}

	[ret makeImmutable];

	return ret;
}

- (OFArray*)elementsForNamespace: (OFString*)elementNS
{
	OFMutableArray OF_GENERIC(OFXMLElement*) *ret = [OFMutableArray array];
	OFXMLNode *const *objects = [_children objects];
	size_t i, count = [_children count];

	for (i = 0; i < count; i++) {
		if ([objects[i] isKindOfClass: [OFXMLElement class]]) {
			OFXMLElement *element = (OFXMLElement*)objects[i];
	for (OFXMLNode *child in _children) {
		if ([child isKindOfClass: [OFXMLElement class]]) {
			OFXMLElement *element = (OFXMLElement*)child;

			if (element->_name != nil &&
			    [element->_namespace isEqual: elementNS])
				[ret addObject: element];
		}
	}

	[ret makeImmutable];

	return ret;
}

- (OFArray*)elementsForName: (OFString*)elementName
		  namespace: (OFString*)elementNS
{
	OFMutableArray OF_GENERIC(OFXMLElement*) *ret;
	OFXMLNode *const *objects;
	size_t i, count;

	if (elementNS == nil)
		return [self elementsForName: elementName];

	ret = [OFMutableArray array];
	objects = [_children objects];
	count = [_children count];

	for (i = 0; i < count; i++) {
		if ([objects[i] isKindOfClass: [OFXMLElement class]]) {
			OFXMLElement *element = (OFXMLElement*)objects[i];
	for (OFXMLNode *child in _children) {
		if ([child isKindOfClass: [OFXMLElement class]]) {
			OFXMLElement *element = (OFXMLElement*)child;

			if ([element->_namespace isEqual: elementNS] &&
			    [element->_name isEqual: elementName])
				[ret addObject: element];
		}
	}

Modified src/OFXMLElementBuilder.m from [bdb4c731ad] to [4e94b4d443].

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







-
-
-
-
-
-
+
+

-
-
-
+
-
-
-
+
+


-
+

-
-
+
+

-
+








-    (void)parser: (OFXMLParser*)parser
  didStartElement: (OFString*)name
	   prefix: (OFString*)prefix
	namespace: (OFString*)namespace
       attributes: (OFArray*)attributes
{
	OFXMLElement *element;
	OFXMLAttribute *const *objects;
	size_t i, count;

	element = [OFXMLElement elementWithName: name
				      namespace: namespace];
	OFXMLElement *element = [OFXMLElement elementWithName: name
						    namespace: namespace];

	objects = [attributes objects];
	count = [attributes count];

	for (OFXMLAttribute *attribute in attributes) {
	for (i = 0; i < count; i++) {
		if ([objects[i] namespace] == nil &&
		    [[objects[i] name] isEqual: @"xmlns"])
		if ([attribute namespace] == nil &&
		    [[attribute name] isEqual: @"xmlns"])
			continue;

		if ([[objects[i] namespace]
		if ([[attribute namespace]
		    isEqual: @"http://www.w3.org/2000/xmlns/"])
			[element setPrefix: [objects[i] name]
			      forNamespace: [objects[i] stringValue]];
			[element setPrefix: [attribute name]
			      forNamespace: [attribute stringValue]];

		[element addAttribute: objects[i]];
		[element addAttribute: attribute];
	}

	[[_stack lastObject] addChild: element];
	[_stack addObject: element];
}

-  (void)parser: (OFXMLParser*)parser