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

pgenutil.pas, generate_specialization: set the correct module index, so that warnings, etc. that are generated for a type declaration are printed using the module where the generic came from (this is already done for method bodies, but not for declarations)

Browse Source 
git-svn-id: trunk@21271 -
This commit is contained in:
svenbarth 2012-05-11 06:44:12 +00:00
parent 810bd7ddab
commit b3595893c8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/pgenutil.pas
View File

@ -91,6 +91,8 @@ uses
old_block_type: tblock_type; old_block_type: tblock_type;
hashedid: thashedidstring; hashedid: thashedidstring;
state : tspecializationstate; state : tspecializationstate;
hmodule : tmodule;
oldcurrent_filepos : tfileposinfo;
begin begin
{ retrieve generic def that we are going to replace } { retrieve generic def that we are going to replace }
genericdef:=tstoreddef(tt); genericdef:=tstoreddef(tt);
@ -426,9 +428,17 @@ uses
if not assigned(genericdef.generictokenbuf) then if not assigned(genericdef.generictokenbuf) then
internalerror(200511171); internalerror(200511171);
hmodule:=find_module_from_symtable(genericdef.owner);
if hmodule=nil then
internalerror(2012051202);
oldcurrent_filepos:=current_filepos;
{ use the index the module got from the current compilation process }
current_filepos.moduleindex:=hmodule.unit_index;
current_tokenpos:=current_filepos;
current_scanner.startreplaytokens(genericdef.generictokenbuf, current_scanner.startreplaytokens(genericdef.generictokenbuf,
genericdef.change_endian); genericdef.change_endian);
read_named_type(tt,finalspecializename,genericdef,generictypelist,false); read_named_type(tt,finalspecializename,genericdef,generictypelist,false);
current_filepos:=oldcurrent_filepos;
ttypesym(srsym).typedef:=tt; ttypesym(srsym).typedef:=tt;
tt.typesym:=srsym; tt.typesym:=srsym;