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

Merge branch 'main' into 'main'

Browse Source 
gir2pascal: Fixed generation of unnamed unions handling within objects.

See merge request freepascal.org/lazarus/lazarus!167
This commit is contained in:
Maxim Ganetsky 2023-05-22 22:28:34 +00:00
commit 62acfd9909
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/gir2pascal/girpascalwritertypes.pas
View File

@ -1523,6 +1523,7 @@ var
var
SetFound: Boolean;
PropType: String;
FieldName: String;
begin
if not MeetsVersionConstraints(Field) then
@ -1572,7 +1573,11 @@ var
Field.CType := AItem.CType+'_union_'+Field.Name;
ResolveTypeTranslation(Field);
HandleUnion(TgirUnion(Field));
TypeDecl.Add(IndentText(SanitizeName(Field.Name, UsedNames)+': '+ Field.TranslatedName+'; //union extracted from object and named '''+Field.TranslatedName+'''',4,0));
FieldName := Field.Name;
if FieldName = '' then begin
FieldName := '__unnamed_field__' + Field.CType;
end;
TypeDecl.Add(IndentText(SanitizeName(FieldName, UsedNames)+': '+ Field.TranslatedName+'; //union extracted from object and named '''+Field.TranslatedName+'''',4,0));
end
end;
end;