gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor optimisation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36375 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-03-17 14:06:32 +00:00
parent c82fbb5426
commit 9662cf9244
2 changed files with 73 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-03-17 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSSet.m: Some optimisation for set intersection.
2013-03-16 Fred Kiefer <FredKiefer@gmx.de>
* Tests/base/NSLocale/general.m,

92
Source/GSSet.m
View file

@ -280,14 +280,10 @@ static Class mutableSetClass;
{
Class c;
/*
* If this set is empty, or the other is nil, this method should return NO.
/* If this set is empty, or the other is nil/empty,
* this method should return NO.
*/
if (map.nodeCount == 0)
{
return NO;
}
if (otherSet == nil)
if (0 == map.nodeCount || nil == otherSet || [otherSet count] == 0)
{
return NO;
}
@ -632,26 +628,76 @@ static Class mutableSetClass;
return self;
}
- (void) intersectSet: (NSSet*) other
- (void) intersectSet: (NSSet*)other
{
if (other != self)
if (nil == other)
{
GSIMapEnumerator_t enumerator = GSIMapEnumeratorForMap(&map);
GSIMapBucket bucket = GSIMapEnumeratorBucket(&enumerator);
GSIMapNode node = GSIMapEnumeratorNextNode(&enumerator);
GSIMapCleanMap(&map);
}
else if (other != self && map.nodeCount > 0)
{
GSIMapEnumerator_t enumerator;
GSIMapBucket bucket;
GSIMapNode node;
Class c;
while (node != 0)
{
if (NO == [other isKindOfClass: [NSSet class]])
{
[NSException raise: NSInvalidArgumentException
format: @"-intersectSet: other object is not a set"];
}
if (0 == map.nodeCount)
{
return; // Already empty ... nothing to do
}
if (0 == [other count])
{
GSIMapCleanMap(&map); // Other empty ... no intersection
return;
}
if ([other containsObject: node->key.obj] == NO)
{
GSIMapRemoveNodeFromMap(&map, bucket, node);
GSIMapFreeNode(&map, node);
}
bucket = GSIMapEnumeratorBucket(&enumerator);
node = GSIMapEnumeratorNextNode(&enumerator);
}
GSIMapEndEnumerator(&enumerator);
c = object_getClass(other);
if (c == setClass || c == mutableSetClass)
{
GSSet *o = (GSSet*)other;
enumerator = GSIMapEnumeratorForMap(&map);
bucket = GSIMapEnumeratorBucket(&enumerator);
node = GSIMapEnumeratorNextNode(&enumerator);
while (node != 0)
{
if (0 == GSIMapNodeForKey(&o->map, node->key))
{
GSIMapRemoveNodeFromMap(&map, bucket, node);
GSIMapFreeNode(&map, node);
}
bucket = GSIMapEnumeratorBucket(&enumerator);
node = GSIMapEnumeratorNextNode(&enumerator);
}
GSIMapEndEnumerator(&enumerator);
}
else
{
SEL sel = @selector(member:);
IMP imp = [other methodForSelector: sel];
enumerator = GSIMapEnumeratorForMap(&map);
bucket = GSIMapEnumeratorBucket(&enumerator);
node = GSIMapEnumeratorNextNode(&enumerator);
while (node != 0)
{
if (nil == (*imp)(other, sel, node->key.obj))
{
GSIMapRemoveNodeFromMap(&map, bucket, node);
GSIMapFreeNode(&map, node);
}
bucket = GSIMapEnumeratorBucket(&enumerator);
node = GSIMapEnumeratorNextNode(&enumerator);
}
GSIMapEndEnumerator(&enumerator);
}
}
}