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

* Fix from Bart Broersma (better handling of managed data), issue ID #38406

Browse Source 
git-svn-id: trunk@48435 -
This commit is contained in:
michael 2021-01-27 11:40:03 +00:00
parent 71f5e4534e
commit e723c1fff6
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/fcl-stl/src/gdeque.pp
View File

@ -40,9 +40,12 @@ type
procedure MoveSimpleData(StartIndex: SizeUInt; Offset: SizeInt; NrElems: SizeUInt);
procedure MoveManagedData(StartIndex: SizeUInt; Offset: SizeInt; NrElems: SizeUInt);
procedure MoveData(StartIndex: SizeUInt; Offset: SizeInt; NrElems: SizeUInt);
procedure ClearSingleDataEntry(Index: SizeUInt); virtual;
procedure ClearData; virtual;
public
function Size():SizeUInt;inline;
constructor Create();
destructor Destroy(); override;
Procedure Clear;
procedure PushBack(value:T);inline;
procedure PushFront(value:T);inline;
@ -68,8 +71,15 @@ begin
FStart:=0;
end;
destructor TDeque.Destroy();
begin
Clear;
inherited Destroy;
end;
procedure TDeque.Clear;
begin
ClearData;
FDataSize:=0;
FStart:=0;
end;
@ -96,6 +106,7 @@ procedure TDeque.PopFront();inline;
begin
if(FDataSize>0) then
begin
ClearSingleDataEntry(FStart);
inc(FStart);
dec(FDataSize);
if(FStart=FCapacity) then
@ -106,7 +117,10 @@ end;
procedure TDeque.PopBack();inline;
begin
if(FDataSize>0) then
begin
ClearSingleDataEntry((FStart+FDataSize-1)mod FCapacity);
dec(FDataSize);
end;
end;
procedure TDeque.PushFront(value:T);inline;
@ -136,8 +150,7 @@ end;
procedure TDeque.SetValue(position:SizeUInt; value:T);inline;
begin
Assert(position < size, 'Deque access out of range');
if IsManagedType(T) then
Finalize(FData[(FStart+position)mod FCapacity]);
ClearSingleDataEntry((FStart+position)mod FCapacity);
FData[(FStart+position)mod FCapacity]:=value;
end;
@ -154,7 +167,6 @@ begin
end;
procedure TDeque.MoveSimpleData(StartIndex: SizeUInt; Offset: SizeInt; NrElems: SizeUInt);
begin
Move(FData[StartIndex], FData[StartIndex+Offset], NrElems*SizeOf(T));
@ -187,6 +199,27 @@ begin
MoveSimpleData(StartIndex, Offset, NrElems);
end;
procedure TDeque.ClearSingleDataEntry(Index: SizeUInt);
begin
if IsManagedType(T) then
begin
Finalize(FData[Index]);
FillChar(FData[Index], SizeOf(T), 0);
end
else
FData[Index] := default(T);
end;
procedure TDeque.ClearData;
var
i: SizeUint;
begin
if IsManagedType(T) then
for i := Low(FData) to High(FData) do
Finalize(FData[i]);
FillChar(FData[Low(FData)], SizeUInt(Length(FData))*SizeOf(T), 0);
end;
procedure TDeque.IncreaseCapacity;
function Min(const A,B: SizeUInt): SizeUInt; inline; //no need to drag in the entire Math unit ;-)
begin