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

LazReport: Use TSysCharSet, See MR !310

Browse Source
This commit is contained in:
Jesus Reyes A 2024-08-24 01:12:49 -06:00
parent 012e0d2d85
commit dd08224a11
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/lazreport/source/addons/addfunction/frFuncStr.pas
View File

@ -31,14 +31,11 @@ interface
uses
SysUtils;
type
TfrCharSet = set of Char;
// RxLib
function frWordPosition(const N: Integer; const S: string; const WordDelims: TfrCharSet): Integer;
function frExtractWord(N: Integer; const S: string; const WordDelims: TfrCharSet): string;
function frWordCount(const S: string; const WordDelims: TfrCharSet): Integer;
function frIsWordPresent(const W, S: string; const WordDelims: TfrCharSet): Boolean;
function frWordPosition(const N: Integer; const S: string; const WordDelims: TSysCharSet): Integer;
function frExtractWord(N: Integer; const S: string; const WordDelims: TSysCharSet): string;
function frWordCount(const S: string; const WordDelims: TSysCharSet): Integer;
function frIsWordPresent(const W, S: string; const WordDelims: TSysCharSet): Boolean;
function frNPos(const C: string; S: string; N: Integer): Integer;
function frReplaceStr(const S, Srch, Replace: string): string;
@ -64,7 +61,7 @@ uses LazUTF8;
{ Return position first character N words in string S, use }
{ const WordDelims (type TCharSet) as delimiter between words }
{--------------------------------------------------------------------}
function frWordPosition(const N: Integer; const S: string; const WordDelims: TfrCharSet): Integer;
function frWordPosition(const N: Integer; const S: string; const WordDelims: TSysCharSet): Integer;
var
Count, I: Integer;
@ -90,7 +87,7 @@ end; { frWordPosition }
{ Extract N word from string S, use WordDelims as }
{ delimiter between words }
{--------------------------------------------------------------------}
function frExtractWord(N: Integer; const S: string; const WordDelims: TfrCharSet): string;
function frExtractWord(N: Integer; const S: string; const WordDelims: TSysCharSet): string;
var
I: Integer;
Len: Integer;
@ -116,7 +113,7 @@ end; { frExtractWord }
{ Count words in string S, use WordDelims as delimiter }
{ between words }
{--------------------------------------------------------------------}
function frWordCount(const S: string; const WordDelims: TfrCharSet): Integer;
function frWordCount(const S: string; const WordDelims: TSysCharSet): Integer;
var
SLen, I: Cardinal;
@ -137,7 +134,7 @@ end; { frWordCount }
{ Check existing word W in string S, use }
{ WordDelims as possible delimiters between words }
{--------------------------------------------------------------------}
function frIsWordPresent(const W, S: string; const WordDelims: TfrCharSet): Boolean;
function frIsWordPresent(const W, S: string; const WordDelims: TSysCharSet): Boolean;
var
Count, I: Integer;

4
components/lazreport/source/addons/addfunction/lrAddFunctionLibrary.pas
View File

@ -56,9 +56,9 @@ end;
{ TAddFunctionLibrary }
{--------------------------------------------------------------------}
{ Convert from typeString into type TfrCharSet }
{ Convert from typeString into type TSysCharSet }
{--------------------------------------------------------------------}
function ConvCS(cStr :String) :TfrCharSet;
function ConvCS(cStr :String) :TSysCharSet;
var
i :Integer;
begin