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

* Fix from Mattias Gaertner to catch EScannerError and setting FLast* fields

Browse Source 
git-svn-id: trunk@35580 -
This commit is contained in:
michael 2017-03-14 10:52:12 +00:00
parent 3ce54eb3de
commit 0a2868b450
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -832,8 +832,20 @@ begin
until not (FCurToken in WhitespaceTokensToIgnore);
except
on e: EScannerError do
raise EParserError.Create(e.Message,
Scanner.CurFilename, Scanner.CurRow, Scanner.CurColumn);
begin
if po_KeepScannerError in Options then
raise e
else
begin
FLastMsgType := mtError;
FLastMsgNumber := Scanner.LastMsgNumber;
FLastMsgPattern := Scanner.LastMsgPattern;
FLastMsg := Scanner.LastMsg;
FLastMsgArgs := Scanner.LastMsgArgs;
raise EParserError.Create(e.Message,
Scanner.CurFilename, Scanner.CurRow, Scanner.CurColumn);
end;
end;
end;
FCurTokenString := Scanner.CurTokenString;
FTokenBuffer[FTokenBufferSize] := FCurToken;
@ -3562,7 +3574,6 @@ Var
PM : TProcedureModifier;
Done: Boolean;
ResultEl: TPasResultElement;
I : Integer;
OK : Boolean;
begin