Bugfix in array - use insertion sort to make sure we delete objects at indices

correctly.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3723 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,9 @@
+Tue Feb 16  15:35:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSArray.m: ([-removeObjectsFromIndices:]) rewrite to
+	work according to spec.
+	* Testing/nsarray.m: Fixed check on joining strings.
+
 Mon Feb 15  06:14:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/include/NSDebug.h: Declare strerror() if not known to system

Source/NSArray.m

@@ -911,8 +911,45 @@ static NSString	*indentStrings[] = {
 - (void) removeObjectsFromIndices: (unsigned*)indices 
 		       numIndices: (unsigned)count
 {
-  while (count--)
-    [self removeObjectAtIndex:indices[count]];
+  if (count > 0)
+    {
+      unsigned	sorted[count];
+      unsigned	to = 0;
+      unsigned	from = 0;
+      unsigned	i;
+
+      while (from < count)
+	{
+	  unsigned	val = indices[from++];
+
+	  i = to;
+	  while (i > 0 && sorted[i] > val)
+	    {
+	      i--;
+	    }
+	  if (i == to)
+	    {
+	      sorted[to++] = val;
+	    }
+	  else if (sorted[i] < val)
+	    {
+	      unsigned	j = to++;
+
+	      i++;
+	      while (j > i)
+		{
+		  sorted[j] = sorted[j-1];
+		  j--;
+		}
+	      sorted[i] = val;
+	    }
+	}
+
+      while (to--)
+	{
+	  [self removeObjectAtIndex: indices[to]];
+	}
+    }
 }
 
 - (void) removeObjectsInArray: (NSArray*)otherArray

Testing/nsarray.m

@@ -185,7 +185,7 @@ main()
     // Joining string elements
     printf("Method: -componentsJoinedByString:\n");
     i = [c componentsJoinedByString: @"/"];
-    if ([i isEqual: @"NSObject/NSArray/NSMutableArray"])
+    if ([i isEqual: @"<NSObject>/<NSArray>/<NSMutableArray>"])
       printf("%s is correct\n", [i cString]);
     else
       {