paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 04:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: paswrite: fix for fields declarations inside classes. Variables can't be declared directly after methods nor properties (visibility section or var keyword is required)

Browse Source 
git-svn-id: trunk@36798 -
This commit is contained in:
maciej-izak 2017-07-27 10:07:22 +00:00
parent b6c3329f20
commit b087cc81f5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/fcl-passrc/src/paswrite.pp
View File

@ -239,9 +239,18 @@ end;
procedure TPasWriter.WriteClass(AClass: TPasClassType);
var
i: Integer;
Member: TPasElement;
Member, LastMember: TPasElement;
InterfacesListPrefix: string;
LastVisibility, CurVisibility: TPasMemberVisibility;
function ForceVisibility: boolean;
begin
Result := (LastMember <> nil) and
// variables can't be declared directly after methods nor properties
// (visibility section or var keyword is required)
(Member is TPasVariable) and not (LastMember is TPasVariable);
end;
begin
PrepareDeclSection('type');
wrt(AClass.Name + ' = ');
@ -275,11 +284,12 @@ begin
IncIndent;
LastVisibility := visDefault;
LastMember := nil;
for i := 0 to AClass.Members.Count - 1 do
begin
Member := TPasElement(AClass.Members[i]);
CurVisibility := Member.Visibility;
if CurVisibility <> LastVisibility then
if (CurVisibility <> LastVisibility) or ForceVisibility then
begin
DecIndent;
case CurVisibility of
@ -293,6 +303,7 @@ begin
LastVisibility := CurVisibility;
end;
WriteElement(Member);
LastMember := Member;
end;
DecIndent;
wrtln('end;');