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

Merge branch 'PeaZomboss-main-patch-59092' into 'main'

Browse Source 
Codetools: Allow keyword const in generic parameter list. Issue #38087.

See merge request freepascal.org/lazarus/lazarus!58
This commit is contained in:
Juha Manninen 2022-01-19 06:28:42 +00:00
commit 4b4b6acc20
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/pascalparsertool.pas
View File

@ -4237,6 +4237,8 @@ begin
CurNode.Desc:=ctnGenericParams; CurNode.Desc:=ctnGenericParams;
ReadNextAtom; ReadNextAtom;
//debugln(['TPascalParserTool.ReadGenericParamList START ctnGenericParams ',GetAtom]); //debugln(['TPascalParserTool.ReadGenericParamList START ctnGenericParams ',GetAtom]);
if UpAtomIs('CONST') then // read const after <
ReadNextAtom;
if AtomIsIdentifier then begin if AtomIsIdentifier then begin
CreateChildNode; CreateChildNode;
CurNode.Desc:=ctnGenericParameter; CurNode.Desc:=ctnGenericParameter;
@ -4253,6 +4255,8 @@ begin
// read next name // read next name
EndChildNode; EndChildNode;
ReadNextAtom; ReadNextAtom;
if UpAtomIs('CONST') then // read const after , or ;
ReadNextAtom;
AtomIsIdentifierSaveE(20180411194201); AtomIsIdentifierSaveE(20180411194201);
CreateChildNode; CreateChildNode;
CurNode.Desc:=ctnGenericParameter; CurNode.Desc:=ctnGenericParameter;