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

Clean up Generics.Collections. Remove old useless bugs workarounds. More details in mantis 27206.

Browse Source 
git-svn-id: trunk@35407 -
This commit is contained in:
maciej-izak 2017-02-06 22:47:29 +00:00
parent 79076c695d
commit 49f7e90827
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/rtl-generics/src/generics.collections.pas
View File

@ -58,10 +58,6 @@ type
// bug #24254 workaround
// should be TArray = record class procedure Sort<T>(...) etc.
TCustomArrayHelper<T> = class abstract
private
type
// bug #24282
TComparerBugHack = TComparer<T>;
protected
// modified QuickSort from classes\lists.inc
class procedure QuickSort(var AValues: array of T; ALeft, ARight: SizeInt; const AComparer: IComparer<T>);
@ -124,9 +120,6 @@ type
{$DEFINE CUSTOM_LIST_CAPACITY_INC := Result + Result div 2} // ~approximation to golden ratio: n = n * 1.5 }
// {$DEFINE CUSTOM_LIST_CAPACITY_INC := Result * 2} // standard inc
TCustomList<T> = class abstract(TEnumerable<T>)
protected
type // bug #24282
TArrayHelperBugHack = TArrayHelper<T>;
private
FOnNotify: TCollectionNotifyEvent<T>;
function GetCapacity: SizeInt; inline;
@ -366,12 +359,12 @@ end;
class function TCustomArrayHelper<T>.BinarySearch(constref AValues: array of T; constref AItem: T;
out AFoundIndex: SizeInt): Boolean;
begin
Result := BinarySearch(AValues, AItem, AFoundIndex, TComparerBugHack.Default, Low(AValues), Length(AValues));
Result := BinarySearch(AValues, AItem, AFoundIndex, TComparer<T>.Default, Low(AValues), Length(AValues));
end;
class procedure TCustomArrayHelper<T>.Sort(var AValues: array of T);
begin
QuickSort(AValues, Low(AValues), High(AValues), TComparerBugHack.Default);
QuickSort(AValues, Low(AValues), High(AValues), TComparer<T>.Default);
end;
class procedure TCustomArrayHelper<T>.Sort(var AValues: array of T;
@ -979,22 +972,22 @@ end;
procedure TList<T>.Sort;
begin
TArrayHelperBugHack.Sort(FItems, FComparer, 0, Count);
TArrayHelper<T>.Sort(FItems, FComparer, 0, Count);
end;
procedure TList<T>.Sort(const AComparer: IComparer<T>);
begin
TArrayHelperBugHack.Sort(FItems, AComparer, 0, Count);
TArrayHelper<T>.Sort(FItems, AComparer, 0, Count);
end;
function TList<T>.BinarySearch(constref AItem: T; out AIndex: SizeInt): Boolean;
begin
Result := TArrayHelperBugHack.BinarySearch(FItems, AItem, AIndex);
Result := TArrayHelper<T>.BinarySearch(FItems, AItem, AIndex);
end;
function TList<T>.BinarySearch(constref AItem: T; out AIndex: SizeInt; const AComparer: IComparer<T>): Boolean;
begin
Result := TArrayHelperBugHack.BinarySearch(FItems, AItem, AIndex, AComparer);
Result := TArrayHelper<T>.BinarySearch(FItems, AItem, AIndex, AComparer);
end;
{ TThreadList<T> }