paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-18 02:59:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fpslist.deleterange mantis #32807

Browse Source 
git-svn-id: trunk@37871 -
This commit is contained in:
marco 2017-12-29 18:05:13 +00:00
parent cffe17f3ce
commit b20dd5cdbb
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rtl/objpas/fgl.pp
View File

@ -71,6 +71,7 @@ type
function Add(Item: Pointer): Integer;
procedure Clear;
procedure Delete(Index: Integer);
procedure DeleteRange(IndexFrom, IndexTo : Integer);
class procedure Error(const Msg: string; Data: PtrInt);
procedure Exchange(Index1, Index2: Integer);
function Expand: TFPSList;
@ -578,6 +579,35 @@ begin
FillChar(InternalItems[FCount]^, (FCapacity+1-FCount) * FItemSize, #0);
end;
procedure TFPSList.DeleteRange(IndexFrom, IndexTo : Integer);
var
ListItem: Pointer;
I: Integer;
OldCnt : Integer;
begin
CheckIndex(IndexTo);
CheckIndex(IndexFrom);
OldCnt:=FCount;
Dec(FCount,IndexTo-IndexFrom+1);
For I :=IndexFrom To Indexto Do
begin
ListItem := InternalItems[I];
Deref(ListItem);
end;
System.Move(InternalItems[IndexTo+1]^, InternalItems[IndexFrom]^, (OldCnt - IndexTo-1) * FItemSize);
// Shrink the list if appropriate
if (FCapacity > 256) and (FCount < FCapacity shr 2) then
begin
FCapacity := FCapacity shr 1;
ReallocMem(FList, (FCapacity+1) * FItemSize);
end;
{ Keep the ending of the list filled with zeros, don't leave garbage data
there. Otherwise, we could accidentally have there a copy of some item
on the list, and accidentally Deref it too soon.
See http://bugs.freepascal.org/view.php?id=20005. }
FillChar(InternalItems[FCount]^, (FCapacity+1-FCount) * FItemSize, #0);
end;
procedure TFPSList.Extract(Item: Pointer; ResultPtr: Pointer);
var
i : Integer;