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

LazUtils: Check for Pascal keywords in LazIsValidIdent. Must be prepended with '&'. Merge request 11 by Abdullahi Usman.

Browse Source
This commit is contained in:
Juha 2021-09-26 00:04:43 +03:00
parent 0b817c8df3
commit 5a1abf733a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/lazutils/lazstringutils.pas
View File

@ -16,7 +16,7 @@ unit LazStringUtils;
interface
uses
Classes, SysUtils,
Classes, SysUtils, PascodeGen,
// LazUtils
LazUTF8, LazLoggerBase, LazTracer;
@ -1415,27 +1415,30 @@ end;
function LazIsValidIdent(const Ident: string; AllowDots: Boolean = False;
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.
// Later modified to check for Pascal keywords. They must be prepended with '&'.
const
Alpha = ['A'..'Z', 'a'..'z', '_'];
AlphaNum = Alpha + ['0'..'9'];
Dot = '.';
var
First: Boolean;
I, Len: Integer;
I, Len, Poz: Integer;
begin
Len := Length(Ident);
if Len < 1 then
if (Len < 1) or (TPascalCodeGenerator(nil).IsKeyWord(Ident)) then
Exit(False);
First := True;
for I := 1 to Len do
if Ident[1] = '&' then
Poz := 2
else
Poz := 1;
for I := Poz to Len do
begin
if First then
begin
Result := Ident[I] in Alpha;
First := False;
end
else if AllowDots and (Ident[I] = Dot) then
else if AllowDots and (Ident[I] = '.') then
begin
if StrictDots then
begin