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

* Fix by Mark Paley to add IfThen for StringList and TStringDynArray. Issue #39314

Browse Source
This commit is contained in:
Michaël Van Canneyt 2021-08-21 09:13:06 +02:00
parent c587f5a681
commit 52c8ac0ca0
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/rtl-objpas/src/inc/strutils.pp
View File

@ -74,6 +74,7 @@ Function AnsiReverseString(const AText: AnsiString): AnsiString;inline;
Function StuffString(const AText: string; AStart, ALength: Cardinal; const ASubText: string): string;
Function RandomFrom(const AValues: array of string): string; overload;
Function IfThen(AValue: Boolean; const ATrue: string; const AFalse: string = ''): string; overload;
Function IfThen(AValue: Boolean; const ATrue: TStringDynArray; const AFalse: TStringDynArray = nil): TStringDynArray; overload;
function NaturalCompareText (const S1 , S2 : string ): Integer ;
function NaturalCompareText(const Str1, Str2: string; const ADecSeparator, AThousandSeparator: Char): Integer;
@ -1227,6 +1228,15 @@ begin
result:=afalse;
end;
Function IfThen(AValue: Boolean; const ATrue: TStringDynArray; const AFalse: TStringDynArray = nil): TStringDynArray; overload;
begin
if avalue then
result:=atrue
else
result:=afalse;
end;
function NaturalCompareText(const Str1, Str2: string; const ADecSeparator, AThousandSeparator: Char): Integer;
{
NaturalCompareBase compares strings in a collated order and

9
rtl/objpas/classes/classes.inc
View File

@ -2459,6 +2459,15 @@ end;
{ Utility routines }
Function IfThen(AValue: Boolean; const ATrue: TStringList; const AFalse: TStringList = nil): TStringList; overload;
begin
if avalue then
result:=atrue
else
result:=afalse;
end;
function LineStart(Buffer, BufPos: PChar): PChar;
begin

2
rtl/objpas/classes/classesh.inc
View File

@ -2469,4 +2469,4 @@ function LineStart(Buffer, BufPos: PChar): PChar;
procedure BinToHex(BinValue, HexValue: PChar; BinBufSize: Integer); deprecated 'use procedures from unit StrUtils';
function HexToBin(HexValue, BinValue: PChar; BinBufSize: Integer): Integer;
function ExtractStrings(Separators, WhiteSpace: TSysCharSet; Content: PChar; Strings: TStrings; AddEmptyStrings : Boolean = False): Integer;
Function IfThen(AValue: Boolean; const ATrue: TStringList; const AFalse: TStringList = nil): TStringList; overload;