paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 14:48:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Restore messages state

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-02-21 14:59:40 +01:00 committed by Michael Van Canneyt
parent 1351746a46
commit 9cc30829fa
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/globstat.pas
View File

@ -81,7 +81,7 @@ procedure restore_global_state(state:tglobalstate;full:boolean);
implementation
uses
pbase,comphook;
switches, verbose, pbase,comphook;
var
states : array of tglobalstate;
@ -159,6 +159,14 @@ var
oldidtoken:=idtoken;
old_block_type:=block_type;
oldtokenpos:=current_tokenpos;
{
consuming the semicolon after a uses clause can add to the
pending state if the first directives change warning state.
So we must flush before context switch. See for example:
ppcgen/cgppc.pas
line 144 has a WARN 6018 OFF...
}
flushpendingswitchesstate;
old_switchesstatestack:=switchesstatestack;
old_switchesstatestackpos:=switchesstatestackpos;
@ -167,7 +175,6 @@ var
{ save akt... state }
{ handle the postponed case first }
//flushpendingswitchesstate;
oldcurrent_filepos:=current_filepos;
old_settings:=current_settings;
old_verbosity:=status.verbosity;
@ -205,6 +212,9 @@ var
current_filepos:=oldcurrent_filepos;
current_settings:=old_settings;
status.verbosity:=old_verbosity;
{ restore message settings which were recorded prior to unit switch }
RestoreLocalVerbosity(current_settings.pmessage);
if full then
begin