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

JCF2: Support nested procedure types. Issue #31823, patch from CCRDude.

Browse Source 
git-svn-id: trunk@54963 -
This commit is contained in:
juha 2017-05-18 08:36:48 +00:00
parent 4676d39ba2
commit 19d467d3e1
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1193,6 +1193,12 @@ begin
RecogniseGenericType; RecogniseGenericType;
end; end;
if fcTokenList.FirstSolidTokenType = ttIs then
begin
Recognise(ttIs);
Recognise(ttNested);
end;
// the type can be deprecated // the type can be deprecated
if fcTokenList.FirstSolidTokenType = ttDeprecated then if fcTokenList.FirstSolidTokenType = ttDeprecated then
Recognise(ttDeprecated); Recognise(ttDeprecated);

2
components/jcf2/Parse/Tokens.pas
View File

@ -191,6 +191,7 @@ type
ttGeneric, ttGeneric,
ttCVar, ttCVar,
ttNostackframe, ttNostackframe,
ttNested,
// used in asm // used in asm
ttOffset, ttOffset,
ttPtr, ttPtr,
@ -687,6 +688,7 @@ begin
AddKeyword('cvar', wtReservedWordDirective, ttCVar); AddKeyword('cvar', wtReservedWordDirective, ttCVar);
AddKeyword('nostackframe', wtReservedWordDirective, ttNostackframe); AddKeyword('nostackframe', wtReservedWordDirective, ttNostackframe);
AddKeyword('nested', wtReservedWordDirective, ttNested);
// asm // asm
AddKeyword('offset', wtReservedWordDirective, ttOffset); AddKeyword('offset', wtReservedWordDirective, ttOffset);