paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-16 13:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: parser: proctype position at end bracket open

Browse Source 
git-svn-id: trunk@37252 -
This commit is contained in:
Mattias Gaertner 2017-09-18 18:51:27 +00:00
parent 4a4f143d0c
commit e5ac6d2769
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/fcl-passrc/src/pparser.pp
View File

@ -5366,11 +5366,10 @@ function TPasParser.ParseProcedureOrFunctionDecl(Parent: TPasElement; ProcType:
if Parent is TImplementationSection then
begin
NextToken;
While CurToken in [tkDot,tkLessThan] do
begin
repeat
if CurToken=tkDot then
Result:=Result+'.'+ExpectIdentifier
else
else if CurToken=tkLessThan then
begin // <> can be ignored, we read the list but discard its content
UnGetToken;
L:=TFPList.Create;
@ -5381,9 +5380,11 @@ function TPasParser.ParseProcedureOrFunctionDecl(Parent: TPasElement; ProcType:
TPasElement(L[i]).Release;
L.Free;
end;
end;
end
else
break;
NextToken;
end;
until false;
UngetToken;
end;
end;
@ -5418,7 +5419,7 @@ begin
Result.ProcType := TPasProcedureType(CreateElement(TPasProcedureType, '', Result))
else
begin
Result.ProcType := CreateFunctionType('', 'Result', Result, True, CurSourcePos);
Result.ProcType := CreateFunctionType('', 'Result', Result, True, CurTokenPos);
if (ProcType in [ptOperator, ptClassOperator]) then
begin
TPasOperator(Result).TokenBased:=IsTokenBased;