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

* replace/restore_scanner use var in state to make sure the correct scanner is freed

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-01-31 13:47:17 +01:00 committed by Michael Van Canneyt
parent 8fa3c57c1b
commit 4443e83b75
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/symcreat.pas
View File

@ -35,6 +35,7 @@ interface
type type
tscannerstate = record tscannerstate = record
new_scanner: tscannerfile;
old_scanner: tscannerfile; old_scanner: tscannerfile;
old_filepos: tfileposinfo; old_filepos: tfileposinfo;
old_token: ttoken; old_token: ttoken;
@ -166,7 +167,8 @@ implementation
{ creating a new scanner resets the block type, while we want to continue { creating a new scanner resets the block type, while we want to continue
in the current one } in the current one }
old_block_type:=block_type; old_block_type:=block_type;
current_scanner:=tscannerfile.Create('_Macro_.'+tempname,true); sstate.new_scanner:=tscannerfile.Create('_Macro_.'+tempname,true);
set_current_scanner(sstate.new_scanner,False);
block_type:=old_block_type; block_type:=old_block_type;
{ required for e.g. FpcDeepCopy record method (uses "out" parameter; field { required for e.g. FpcDeepCopy record method (uses "out" parameter; field
names are escaped via &, so should not cause conflicts } names are escaped via &, so should not cause conflicts }
@ -178,8 +180,8 @@ implementation
begin begin
if sstate.valid then if sstate.valid then
begin begin
current_scanner.free; sstate.new_scanner.free;
current_scanner:=sstate.old_scanner; set_current_scanner(sstate.old_scanner,false);
current_filepos:=sstate.old_filepos; current_filepos:=sstate.old_filepos;
token:=sstate.old_token; token:=sstate.old_token;
current_settings.modeswitches:=sstate.old_modeswitches; current_settings.modeswitches:=sstate.old_modeswitches;