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

LazStringUtils: deprecate LazIsValidIdent and use SysUtils.IsValidIdent in it's implementation.

Browse Source
This commit is contained in:
Bart 2024-09-04 13:02:16 +02:00
parent 93af67085a
commit e76c844eee
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/lazutils/lazstringutils.pas
View File

@ -112,7 +112,7 @@ function LoadStringFromFile(const aFileName: String): String;
// Like IsValidIdent() in FPC 3.1. // Like IsValidIdent() in FPC 3.1.
function LazIsValidIdent(const Ident: string; AllowDots: Boolean = False; function LazIsValidIdent(const Ident: string; AllowDots: Boolean = False;
StrictDots: Boolean = False): Boolean; StrictDots: Boolean = False): Boolean; deprecated 'Use SysUtils.IsValidIdent instead'; //Remove in 4.99
const const
MaxTextLen = 80; MaxTextLen = 80;
@ -1444,39 +1444,8 @@ end;
function LazIsValidIdent(const Ident: string; AllowDots: Boolean = False; function LazIsValidIdent(const Ident: string; AllowDots: Boolean = False;
StrictDots: Boolean = False): Boolean; StrictDots: Boolean = False): Boolean;
// This is a copy of IsValidIdent from FPC 3.1.
// ToDo: Switch to using IsValidIdent from FPC 3.2 when it is the minimum requirement.
const
Alpha = ['A'..'Z', 'a'..'z', '_'];
AlphaNum = Alpha + ['0'..'9'];
var
First: Boolean;
I, Len: Integer;
begin begin
Len := Length(Ident); Result := SysUtils.IsValidIdent(Ident, AllowDots, StrictDots);
if Len < 1 then
Exit(False);
First := True;
for I := 1 to Len do
begin
if First then
begin
Result := Ident[I] in Alpha;
First := False;
end
else if AllowDots and (Ident[I] = '.') then
begin
if StrictDots then
begin
Result := I < Len;
First := True;
end;
end
else
Result := Ident[I] in AlphaNum;
if not Result then
Break;
end;
end; end;
end. end.