6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-06-11 05:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some code that adjusts an index after a deletion from a collection.

Browse Source
This commit is contained in:
Greg King 2016-07-02 10:26:33 -04:00
parent dfea22389c
commit 90b2f5aff8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/coll.c
View File

@ -161,7 +161,7 @@ void CollAppend (Collection* C, void* Item)
{ {
/* Insert the item at the end of the current list */ /* Insert the item at the end of the current list */
CollInsert (C, Item, C->Count); CollInsert (C, Item, C->Count);
} }
#endif #endif
@ -341,22 +341,23 @@ void CollReplaceExpand (Collection* C, void* Item, unsigned Index)
void CollMove (Collection* C, unsigned OldIndex, unsigned NewIndex) void CollMove (Collection* C, unsigned OldIndex, unsigned NewIndex)
/* Move an item from one position in the collection to another. OldIndex /* Move an item from one position in the collection to another. OldIndex
** is the current position of the item, NewIndex is the new index after ** is the current position of the item, NewIndex is the new index before
** the function has done it's work. Existing entries with indices NewIndex ** the function has done it's work. Existing entries with indices NewIndex
** and up are moved one position upwards. ** and up might be moved one position upwards.
*/ */
{ {
/* Get the item and remove it from the collection */ /* Get the item; and, remove it from the collection */
void* Item = CollAt (C, OldIndex); void* Item = CollAt (C, OldIndex);
CollDelete (C, OldIndex); CollDelete (C, OldIndex);
/* Correct NewIndex if needed */ /* Correct NewIndex if needed */
if (NewIndex >= OldIndex) { if (NewIndex > OldIndex) {
/* Position has changed with removal */ /* Position has changed with removal */
--NewIndex; --NewIndex;
} }
/* Now insert it at the new position */ /* Now, insert it at the new position */
CollInsert (C, Item, NewIndex); CollInsert (C, Item, NewIndex);
} }

4
src/common/coll.h
View File

@ -268,9 +268,9 @@ void CollReplaceExpand (Collection* C, void* Item, unsigned Index);
void CollMove (Collection* C, unsigned OldIndex, unsigned NewIndex); void CollMove (Collection* C, unsigned OldIndex, unsigned NewIndex);
/* Move an item from one position in the collection to another. OldIndex /* Move an item from one position in the collection to another. OldIndex
** is the current position of the item, NewIndex is the new index after ** is the current position of the item, NewIndex is the new index before
** the function has done it's work. Existing entries with indices NewIndex ** the function has done it's work. Existing entries with indices NewIndex
** and up are moved one position upwards. ** and up might be moved one position upwards.
*/ */
void CollMoveMultiple (Collection* C, unsigned Start, unsigned Count, unsigned Target); void CollMoveMultiple (Collection* C, unsigned Start, unsigned Count, unsigned Target);