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

codetools: CompareIdentifiers: support ampersand identifiers

Browse Source
This commit is contained in:
mattias 2024-08-03 10:20:34 +02:00
parent 0f51c593fd
commit df8ab730bb
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/codetools/keywordfunclists.pas
View File

@ -221,8 +221,18 @@ end;
function CompareIdentifiers(Identifier1, Identifier2: PChar): integer;
begin
if (Identifier1<>nil) then begin
if (Identifier2<>nil) then begin
if (Identifier1<>nil)
and (IsIdentStartChar[Identifier1^]
or ((Identifier1^='&') and IsIdentStartChar[Identifier1[1]])) then
begin
if Identifier1[0]='&' then inc(Identifier1);
if (Identifier2<>nil)
and (IsIdentStartChar[Identifier2^]
or ((Identifier2^='&') and IsIdentStartChar[Identifier2[1]])) then
begin
if Identifier2[0]='&' then inc(Identifier2);
while (UpChars[Identifier1[0]]=UpChars[Identifier2[0]]) do begin
if (IsIdentChar[Identifier1[0]]) then begin
inc(Identifier1);
@ -251,7 +261,10 @@ begin
Result:=-1; // for example 'aaa' nil
end;
end else begin
if (Identifier2<>nil) then begin
if (Identifier2<>nil)
and (IsIdentStartChar[Identifier2^]
or ((Identifier2^='&') and IsIdentStartChar[Identifier2[1]])) then
begin
Result:=1; // for example nil 'bbb'
end else begin
Result:=0; // for example nil nil

33
components/codetools/tests/testbasiccodetools.pas
View File

@ -368,37 +368,42 @@ procedure TTestBasicCodeTools.TestCompareIdentifiers;
procedure Test(A, B: PChar; Expected: integer);
var
Actual: Integer;
//AmpA: string;
AmpA, AmpB: string;
begin
Actual:=CompareIdentifiers(A,B);
if Actual<>Expected then
Fail('A='+GetStr(A)+' B='+GetStr(B)+', expected '+dbgs(Expected)+', but got '+dbgs(Actual));
//if (A<>nil) and (IsIdentStartChar[A^]) then begin
// AmpA:='&'+A;
// Test(PChar(AmpA),B,Expected);
//end;
if (A<>nil) and (IsIdentStartChar[A^]) then begin
AmpA:='&'+A;
Test(PChar(AmpA),B,Expected);
if (B<>nil) and (IsIdentStartChar[B^]) then begin
AmpB:='&'+B;
Test(PChar(AmpA),PChar(AmpB),Expected);
end;
end;
end;
procedure t(A, B: PChar; Expected: integer);
begin
Test(A,B,Expected);
if A<>B then
Test(B,A,-Expected)
Test(B,A,-Expected);
end;
begin
// Note: CompareIdentifiers expects identifiers or empty.
// Feeding non identifiers like numbers 1 or octal &1 is not defined.
t(nil,nil,0);
t(nil,#0,1); // current implementation gives 1, but it could be 0, in fact 0 would be better to make sure the empty string is the same
t(nil,#0,0);
t(nil,#1,0);
t(#0,#0,0);
t(#0,#1,0);
t(#1,#2,0);
t('a',nil,-1);
t('a',#0,-1);
t('a','a',0);
t('a','A',0);
t('aa','aa',0);
t('aa','Aa',0);
t('aa','AA',0);
t('aa','a',-1);
t('ab','a',-1);
t('ab','a;',-1);
@ -407,10 +412,16 @@ begin
t('ab;','ab',0);
t('ab;','ab,',0);
t('aAa;','aaA',0);
t('i','I',0);
t('a',';',-1);
t('1','2',1); // current implementation gives 1, but it could be 0, does not matter
t('1','2',0);
t(',',',',0);
t(',',';',0);
t('&',nil,0);
t('&',#0,0);
t('&','&',0);
t('&a','&',-1);
t('&a','&;',-1);
end;
procedure TTestBasicCodeTools.TestDateToCfgStr;