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

+ report when compilation of a unit is stopped because it has been already compiled during the recursive search in uses clauses

Browse Source 
git-svn-id: trunk@30001 -
This commit is contained in:
florian 2015-02-24 21:46:09 +00:00
parent 0a17a08b28
commit 91db2a1698
4 changed files with 473 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/msg/errore.msg
View File

@ -1531,6 +1531,9 @@ parser_w_ptr_type_ignored=03338_W_Pointer type "$1" ignored
parser_e_global_generic_references_static=03339_E_Global Generic template references static symtable parser_e_global_generic_references_static=03339_E_Global Generic template references static symtable
% A generic declared in the interface section of a unit must not reference symbols that belong % A generic declared in the interface section of a unit must not reference symbols that belong
% solely to the implementation section of that unit. % solely to the implementation section of that unit.
parser_u_already_compiled=03340_UL_Unit $1 has been already compiled meanwhile.
% This tells you that the recursive reading of the uses clauses triggered already
% a compilation of the current unit, so the current compilation can be aborded.
% %
% %
% %

5
compiler/msgidx.inc
View File

@ -441,6 +441,7 @@ const
parser_e_default_value_val_const=03337; parser_e_default_value_val_const=03337;
parser_w_ptr_type_ignored=03338; parser_w_ptr_type_ignored=03338;
parser_e_global_generic_references_static=03339; parser_e_global_generic_references_static=03339;
parser_u_already_compiled=03340;
type_e_mismatch=04000; type_e_mismatch=04000;
type_e_incompatible_types=04001; type_e_incompatible_types=04001;
type_e_not_equal_types=04002; type_e_not_equal_types=04002;
@ -1006,9 +1007,9 @@ const
option_info=11024; option_info=11024;
option_help_pages=11025; option_help_pages=11025;
MsgTxtSize = 75269; MsgTxtSize = 75323;
MsgIdxMax : array[1..20] of longint=( MsgIdxMax : array[1..20] of longint=(
26,99,340,1000,96,57,126,29,202,64, 26,99,341,1000,96,57,126,29,202,64,
58,20,1,1,1,1,1,1,1,1 58,20,1,1,1,1,1,1,1,1
); );

922
compiler/msgtxt.inc
View File

File diff suppressed because it is too large Load Diff

6
compiler/pmodules.pas
View File

@ -849,7 +849,11 @@ type
loadunits(nil); loadunits(nil);
{ has it been compiled at a higher level ?} { has it been compiled at a higher level ?}
if current_module.state=ms_compiled then if current_module.state=ms_compiled then
exit; begin
Message1(parser_u_already_compiled,current_module.realmodulename^);
exit;
end;
consume_semicolon_after_uses:=true; consume_semicolon_after_uses:=true;
end end
else else