gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with isSubsetOfOrderedSet:. Objects must be in the same order for the set to be considered a subset.

Browse source
This commit is contained in:
Gregory John Casamento 2019-06-09 15:31:07 -04:00
parent c53336b29e
commit d8030311d0
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Source/NSOrderedSet.m
View file

@ -1095,19 +1095,36 @@ static SEL rlSel;
- (BOOL) isSubsetOfOrderedSet: (NSOrderedSet *)otherSet
{
id o = nil, e = nil;
id f = nil;
NSUInteger s = 0, l = [self count], i = 0;
// -1. If this set is empty, this method should return NO.
if ([self count] == 0)
if (l == 0)
return NO;
// 0. Loop for all members in otherSet
e = [otherSet objectEnumerator];
while ((o = [e nextObject])) // 1. pick a member from otherSet.
// If count of set is more than otherSet it's not a subset
if (l > [otherSet count])
return NO;
// Find the first object's index in otherset, if not found
// it's not a subset...
f = [self firstObject];
s = [otherSet indexOfObject: f];
if(s == NSNotFound)
return NO;
for(i = 0; i < l; i++)
{
if ([self containsObject: o] == NO) // 2. check the member is in this set(self).
return NO;
NSUInteger j = s + i;
id oo = [otherSet objectAtIndex: j];
id o = [self objectAtIndex: i];
if([o isEqual: oo] == NO)
{
return NO;
}
}
return YES; // if all members are in set.
}