paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 17:52:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'main'

Browse Source 
gir2pascal: Fixed issue causing generation of duplicate declarations for some opaque types.

See merge request freepascal.org/lazarus/lazarus!168
This commit is contained in:
Maxim Ganetsky 2023-05-23 13:03:23 +00:00
commit 77ff7ff725
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/gir2pascal/girnamespaces.pas
View File

@ -393,8 +393,7 @@ begin
if Fuzzy <> nil then
begin
if {(Tmp.CType = Fuzzy.CType) or} (Tmp.Name = Fuzzy.Name) then
begin
if Tmp.Name = Fuzzy.Name then begin
Fuzzy.ResolvedType := Tmp;
Tmp.ImpliedPointerLevel:=Fuzzy.ImpliedPointerLevel;
Tmp.DeprecatedOverride:= Tmp.DeprecatedOverride or Fuzzy.DeprecatedOverride;
@ -419,8 +418,15 @@ begin
// if the types are still fuzzy then we will search used namespaces for what we want
for FuzzyP in StillFuzzy do //FuzzyP is Fuzzy absolute
begin
if Fuzzy.ResolvedType <> nil then
continue;
for i:= 0 to FTypes.Count - 1 do begin
Tmp := TGirBaseType(FTypes.Items[i]);
if (Tmp <> Fuzzy) and (Tmp.CType = Fuzzy.Name) then begin
Fuzzy.ResolvedType := Tmp;
Tmp.ImpliedPointerLevel:=Fuzzy.ImpliedPointerLevel;
Tmp.DeprecatedOverride:= Tmp.DeprecatedOverride or Fuzzy.DeprecatedOverride;
//WriteLn('Resolved Fuzzy Type: ', Tmp.CType);
end;
end;
for i := 0 to RequiredNameSpaces.Count-1 do
begin
ReqNS := TgirNamespace(RequiredNameSpaces.Items[i]);