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

Jedi Code Format: Fix formatting when "Enumerator" is the first word in function. Issue #39149, patch by Domingo Galmés.

Browse Source 
git-svn-id: trunk@65365 -
This commit is contained in:
juha 2021-07-04 14:44:13 +00:00
parent 1723957ebb
commit 88694d38af
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@ type
procedure RecogniseAnonymousMethod;
function AnonymousMethodNext: boolean;
procedure CheckEnumeratorToken;
procedure CheckEnumeratorToken(aCheckTwoTokens:boolean=false);
function CheckSpecialize(aRecogniseIfFound:boolean):boolean;
Protected
procedure RaiseParseError(const aMessage: string; aSourceToken: TSourceToken);
@ -4290,7 +4290,7 @@ begin
external is more complex
}
CheckEnumeratorToken();
CheckEnumeratorToken(fcTokenList.FirstSolidTokenType = ttSemicolon);
if (fcTokenList.FirstSolidTokenType in ProcedureDirectives) or
((fcTokenList.FirstSolidTokenType = ttSemicolon) and
(fcTokenList.SolidTokenType(2) in ProcedureDirectives)) then
@ -4301,7 +4301,7 @@ begin
Recognise(ttSemiColon);
lbFirstPass := True;
CheckEnumeratorToken();
CheckEnumeratorToken(fcTokenList.FirstSolidTokenType = ttSemicolon);
while (fcTokenList.FirstSolidTokenType in ProcedureDirectives) or
((fcTokenList.FirstSolidTokenType = ttSemicolon) and
(fcTokenList.SolidTokenType(2) in ProcedureDirectives)) do
@ -5775,7 +5775,7 @@ const
}
PropertyDirectives = [ttDefault, ttNoDefault, ttStored, ttEnumerator];
begin
CheckEnumeratorToken();
CheckEnumeratorToken(fcTokenList.FirstSolidTokenType = ttSemicolon);
if ((fcTokenList.FirstSolidTokenType = ttSemicolon) and
(fcTokenList.SolidTokenType(2) in PropertyDirectives)) or
(fcTokenList.FirstSolidTokenType in PropertyDirectives) then
@ -6008,7 +6008,7 @@ begin
end;
end;
procedure TBuildParseTree.CheckEnumeratorToken;
procedure TBuildParseTree.CheckEnumeratorToken(aCheckTwoTokens:boolean);
var
lc: TSourceToken;
begin
@ -6018,11 +6018,14 @@ begin
lc.TokenType:=ttEnumerator;
lc.WordType:=wtReservedWord;
end;
lc := fcTokenList.SolidToken(2);
if (lc<>nil) and (lc.TokenType=ttIdentifier) and (length(lc.SourceCode)=10) and (lowercase(lc.SourceCode)='enumerator') then
if aCheckTwoTokens then
begin
lc.TokenType:=ttEnumerator;
lc.WordType:=wtReservedWord;
lc := fcTokenList.SolidToken(2);
if (lc<>nil) and (lc.TokenType=ttIdentifier) and (length(lc.SourceCode)=10) and (lowercase(lc.SourceCode)='enumerator') then
begin
lc.TokenType:=ttEnumerator;
lc.WordType:=wtReservedWord;
end;
end;
end;