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

Fix for case when adding a range entirely withn an existing range

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24053 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-11-08 18:16:11 +00:00
parent db244b80bd
commit 4ceae56b24
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-11-08 Richard Frith-Macdonald <rfm@gnu.org>
Source/NSIndexSet.m: ([addIndexesInRange:])
Fix for case when added range lies within existing range.
2006-11-08 Richard Frith-Macdonald <rfm@gnu.org> 2006-11-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSXML.m: ([stringByEscapingXML]) Fix bug causing * Source/Additions/GSXML.m: ([stringByEscapingXML]) Fix bug causing

13
Source/NSIndexSet.m
View file

@ -673,9 +673,16 @@ static unsigned posForIndex(GSIArray array, unsigned index)
{ {
break; break;
} }
r.length += (NSMaxRange(aRange) - NSMaxRange(r)); if (NSMaxRange(r) >= NSMaxRange(aRange))
GSIArrayRemoveItemAtIndex(_array, pos--); {
GSIArraySetItemAtIndex(_array, (GSIArrayItem)r, pos); GSIArrayRemoveItemAtIndex(_array, pos--);
}
else
{
r.length += (NSMaxRange(aRange) - NSMaxRange(r));
GSIArrayRemoveItemAtIndex(_array, pos--);
GSIArraySetItemAtIndex(_array, (GSIArrayItem)r, pos);
}
} }
/* /*