gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Checks for illegal comparator return values.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5349 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-12-01 19:36:20 +00:00
parent 1a846e2eee
commit c3fb857b06
5 changed files with 155 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Source/NSArray.m
View file

@ -1144,18 +1144,23 @@ static NSString *indentStrings[] = {
}
- (void) sortUsingFunction: (int(*)(id,id,void*))compare
context: (void*)context
context: (void*)context
{
/* Shell sort algorithm taken from SortingInAction - a NeXT example */
#define STRIDE_FACTOR 3 // good value for stride factor is not well-understood
// 3 is a fairly good choice (Sedgewick)
unsigned c,d, stride;
BOOL found;
int count = [self count];
unsigned c,d, stride;
BOOL found;
int count = [self count];
#ifdef GSWARN
BOOL badComparison = NO;
#endif
stride = 1;
while (stride <= count)
stride = stride * STRIDE_FACTOR + 1;
{
stride = stride * STRIDE_FACTOR + 1;
}
while(stride > (STRIDE_FACTOR - 1))
{
@ -1165,27 +1170,54 @@ static NSString *indentStrings[] = {
{
found = NO;
if (stride > c)
break;
d = c - stride;
while (!found)
{
// move to left until correct place
id a = [self objectAtIndex: d + stride];
id b = [self objectAtIndex: d];
if ((*compare)(a, b, context) == NSOrderedAscending)
break;
}
d = c - stride;
while (!found) /* move to left until correct place */
{
id a = [self objectAtIndex: d + stride];
id b = [self objectAtIndex: d];
NSComparisonResult r;
r = (*compare)(a, b, context);
if (r < 0)
{
#ifdef GSWARN
if (r != NSOrderedAscending)
{
badComparison = YES;
}
#endif
IF_NO_GC(RETAIN(a));
[self replaceObjectAtIndex: d + stride withObject: b];
[self replaceObjectAtIndex: d withObject: a];
RELEASE(a);
if (stride > d)
break;
{
break;
}
d -= stride; // jump by stride factor
}
else found = YES;
else
{
#ifdef GSWARN
if (r != NSOrderedDescending && r != NSOrderedSame)
{
badComparison = YES;
}
#endif
found = YES;
}
}
}
}
#ifdef GSWARN
if (badComparison == YES)
{
NSWarnMLog(@"Detected bad return value from comparison", 0);
}
#endif
}
@end