gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bufix sorting array.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15273 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-12-10 05:44:56 +00:00
parent 278469e140
commit e12e65212d
3 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,7 +1,12 @@
2002-12-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSArray.m: ([removeObjectsFromIndices:numIndices:])
bugfix for sorting by Kelvin Sherlock.
2002-12-08 Richard Frith-Macdonald <rfm@gnu.org> 2002-12-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSThread.m: Fix race condition firing perform holder. * Source/NSThread.m: Fix race condition firing perform holder.
Fix supplied by {hilip Derrin. Fix supplied by Philip Derrin.
2002-12-05 Richard Frith-Macdonald <rfm@gnu.org> 2002-12-05 Richard Frith-Macdonald <rfm@gnu.org>

2
Source/NSArray.m
View file

@ -1519,7 +1519,7 @@ static int compare(id elem1, id elem2, void* context)
unsigned val = indices[from++]; unsigned val = indices[from++];
i = to; i = to;
while (i > 0 && sorted[i] > val) while (i > 0 && sorted[i-1] > val)
{ {
i--; i--;
} }

36
Testing/nsarray.m
View file

@ -91,24 +91,24 @@ main()
printf("Index of identical object is %d\n", p); printf("Index of identical object is %d\n", p);
NSCParameterAssert([c lastObject]); NSCParameterAssert([c lastObject]);
printf("Classname at index 2 is %s\n", [[c objectAtIndex:2] name]); printf("Class at index 2 is %s\n", [[[c objectAtIndex:2] description] cString]);
printf("Forward enumeration\n"); printf("Forward enumeration\n");
enumerator = [e objectEnumerator]; enumerator = [e objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Reverse enumeration\n"); printf("Reverse enumeration\n");
enumerator = [e reverseObjectEnumerator]; enumerator = [e reverseObjectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
} }
{ {
// Sending messages to elements // Sending messages to elements
[c makeObjectsPerform:@selector(name)]; [c makeObjectsPerform:@selector(description)];
//[c makeObjectsPerform:@selector(isEqual:) withObject: @"NSArray"]; //[c makeObjectsPerform:@selector(isEqual:) withObject: @"NSArray"];
} }
@ -173,7 +173,7 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
if ([f isEqualToArray: c]) if ([f isEqualToArray: c])
@ -234,7 +234,7 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Method -insertObject: [NSMutableArray class] atIndex: 2\n"); printf("Method -insertObject: [NSMutableArray class] atIndex: 2\n");
@ -242,7 +242,7 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
} }
@ -268,7 +268,7 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Method -removeObject: [NSObject class]\n"); printf("Method -removeObject: [NSObject class]\n");
@ -276,7 +276,7 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Method -removeObjectIdenticalTo: [NSArray class]\n"); printf("Method -removeObjectIdenticalTo: [NSArray class]\n");
@ -284,7 +284,7 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Method -removeObjectAtIndex: 2\n"); printf("Method -removeObjectAtIndex: 2\n");
@ -292,19 +292,19 @@ main()
enumerator = [f objectEnumerator]; enumerator = [f objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Method -removeObjectsFromIndices: {7,4,1,3,5,0,6} " printf("Method -removeObjectsFromIndices: {7,4,1,3,5,0,6} "
"numIndices: 6\n"); "numIndices: 6\n");
enumerator = [g objectEnumerator]; enumerator = [g objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
[g removeObjectsFromIndices: ind numIndices: 7]; [g removeObjectsFromIndices: ind numIndices: 7];
enumerator = [g objectEnumerator]; enumerator = [g objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
if ([f isEqualToArray: g]) if ([f isEqualToArray: g])
@ -316,12 +316,12 @@ main()
printf("Receiver array\n"); printf("Receiver array\n");
enumerator = [h objectEnumerator]; enumerator = [h objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Removing objects in this array\n"); printf("Removing objects in this array\n");
enumerator = [c objectEnumerator]; enumerator = [c objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
[h removeObjectsInArray: c]; [h removeObjectsInArray: c];
@ -343,19 +343,19 @@ main()
printf("Method -replaceObjectAtIndex: 2 withObject:[NSString class]\n"); printf("Method -replaceObjectAtIndex: 2 withObject:[NSString class]\n");
enumerator = [c objectEnumerator]; enumerator = [c objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
[c replaceObjectAtIndex: 2 withObject:[NSString class]]; [c replaceObjectAtIndex: 2 withObject:[NSString class]];
enumerator = [c objectEnumerator]; enumerator = [c objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
printf("Method -setArray:\n"); printf("Method -setArray:\n");
[h setArray: f]; [h setArray: f];
enumerator = [h objectEnumerator]; enumerator = [h objectEnumerator];
while ((i = [enumerator nextObject])) while ((i = [enumerator nextObject]))
printf("%s ", [i name]); printf("%s ", [[i description] cString]);
printf("\n"); printf("\n");
if ([h isEqualToArray: h]) if ([h isEqualToArray: h])
printf("-setArray worked properly\n"); printf("-setArray worked properly\n");