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

Jedi Code Format: Fix formatting visibility modifiers in a record. Issue #39931, patch by Domingo Galmés.

Browse Source
This commit is contained in:
Juha 2022-09-30 12:28:15 +03:00
parent 65f67d3bde
commit dd3cb67d40
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/jcf2/Parse/BuildParseTree.pas
View File

@ -163,7 +163,7 @@ type
procedure RecogniseInterfaceType;
procedure RecogniseObjectType;
procedure RecogniseVariantSection;
procedure RecogniseVarDecl;
procedure RecogniseVarDecl(aInClassBody:boolean=false);
procedure RecogniseAddOp;
procedure RecogniseDesignator;
procedure RecogniseDesignatorTail;
@ -2616,7 +2616,7 @@ begin
Recognise(OperatorTokens);
end;
procedure TBuildParseTree.RecogniseVarDecl;
procedure TBuildParseTree.RecogniseVarDecl(aInClassBody:boolean=false);
const
VariableModifiers: TTokenTypeSet = [ttExternal, ttExport, ttPublic];
var
@ -2657,10 +2657,9 @@ begin
else
begin
RecogniseHintDirectives;
if (fcTokenList.FirstSolidTokenType in VariableModifiers) or
if (not aInClassBody) and ((fcTokenList.FirstSolidTokenType in VariableModifiers) or
((fcTokenList.FirstSolidTokenType=ttSemicolon) and
(fcTokenList.SolidTokenType(2) in VariableModifiers)) then
(fcTokenList.SolidTokenType(2) in VariableModifiers))) then
begin
// optional SemiColon
if fcTokenList.FirstSolidTokenType=ttSemicolon then
@ -4861,7 +4860,7 @@ begin
if pbInterface then
RaiseParseError('Unexpected token', fcTokenList.FirstSolidToken);
RecogniseVarDecl;
RecogniseVarDecl(True);
end
else
RaiseParseError('Unexpected token', fcTokenList.FirstSolidToken);