paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 07:43:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* moved Comment calls to messge file

Browse Source
This commit is contained in:
peter 2003-05-25 10:27:12 +00:00
parent 1b72901b14
commit aaf6114364
6 changed files with 405 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/fmodule.pas
View File

@ -567,7 +567,7 @@ uses
{ This is not needed for programs }
if not callermodule.is_unit then
exit;
Comment(V_Used,'Add dependency for '+callermodule.modulename^+' to '+modulename^);
Message2(unit_u_add_depend_to,callermodule.modulename^,modulename^);
dependent_units.concat(tdependent_unit.create(callermodule));
end;
@ -583,14 +583,14 @@ uses
{ We do not have to reload the unit that wants to load
this unit }
if pm.u=callermodule then
Comment(v_used,'No reload, is caller: '+pm.u.modulename^)
Message1(unit_u_no_reload_is_caller,pm.u.modulename^)
else
if pm.u.state=ms_second_compile then
Comment(v_used,'No reload, already in second compile: '+pm.u.modulename^)
Message1(unit_u_no_reload_in_second_compile,pm.u.modulename^)
else
begin
pm.u.do_reload:=true;
Comment(v_used,'Flag for reload '+pm.u.modulename^);
Message1(unit_u_flag_for_reload,pm.u.modulename^);
end;
pm:=tdependent_unit(pm.next);
end;
@ -651,7 +651,10 @@ uses
end.
{
$Log$
Revision 1.34 2003-05-23 14:27:35 peter
Revision 1.35 2003-05-25 10:27:12 peter
* moved Comment calls to messge file
Revision 1.34 2003/05/23 14:27:35 peter
* remove some unit dependencies
* current_procinfo changes to store more info

17
compiler/fppu.pas
View File

@ -1142,7 +1142,7 @@ uses
we must reload when the do_reload flag is set }
if do_reload then
begin
Comment(V_Used,'Forced reloading');
Message(unit_u_forced_reload);
do_reload:=false;
end
else
@ -1169,14 +1169,14 @@ uses
begin
{ try to load the unit a second time first }
Message1(unit_u_second_load_unit,modulename^);
Comment(V_Used,'Previous state '+modulename^+': '+ModuleStateStr[state]);
Message2(unit_u_previous_state,modulename^,ModuleStateStr[state]);
{ Flag modules to reload }
flagdependent(old_current_module);
{ Reset the module }
reset;
if state=ms_compile then
begin
Comment(V_Used,'Already compiling '+modulename^+' setting second compile');
Message1(unit_u_second_compile_unit,modulename^);
state:=ms_second_compile;
do_compile:=true;
end
@ -1197,7 +1197,7 @@ uses
know that we need to compile the unit }
if not do_compile then
begin
Comment(V_Used,'Loading module '+modulename^);
Message1(unit_u_loading_unit,modulename^);
search_unit(false,false);
if not do_compile then
begin
@ -1206,7 +1206,7 @@ uses
begin
load_usedunits;
if not do_compile then
Comment(V_Used,'Finished loading module '+modulename^);
Message1(unit_u_finished_loading_unit,modulename^);
end;
end;
{ PPU is not needed anymore }
@ -1347,7 +1347,7 @@ uses
we create an entry and register the unit }
if not assigned(hp) then
begin
Comment(V_Used,'Registering new unit '+Upper(s));
Message1(unit_u_registering_new_unit,Upper(s));
hp:=tppumodule.create(callermodule,s,fn,true);
hp.loaded_from:=callermodule;
loaded_units.insert(hp);
@ -1359,7 +1359,10 @@ uses
end.
{
$Log$
Revision 1.34 2003-05-23 17:04:37 peter
Revision 1.35 2003-05-25 10:27:12 peter
* moved Comment calls to messge file
Revision 1.34 2003/05/23 17:04:37 peter
* write interface crc to .ppu.intf when enabled
* when a unit is compiled with -Ur check only interface crc

59
compiler/msg/errore.msg
View File

@ -198,7 +198,7 @@ scan_e_keyword_cant_be_a_macro=02028_E_Keyword redefined as macro has no effect
% You cannot redefine keywords with macros.
scan_f_macro_buffer_overflow=02029_F_Macro buffer overflow while reading or expanding a macro
% Your macro or it's result was too long for the compiler.
scan_w_macro_deep_ten=02030_W_Extension of macros exceeds a deep of 16.
scan_w_macro_deep_ten=02030_W_Extension of macros exceeds a depth of 16.
% When expanding a macro macros have been nested to a level of 16.
% The compiler will expand no further, since this may be a sign that
% recursion is used.
@ -289,6 +289,10 @@ scan_w_appname_not_support=02060_W_APPNAME is only supported for PalmOS
scan_e_string_exceeds_255_chars=02061_E_Constant strings can't be longer than 255 chars
% A single string constant can contain at most 255 chars. Try splitting up the
% string in multiple smaller parts and concatenate them with a + operator.
scan_f_include_deep_ten=02062_F_Including include files exceeds a depth of 16.
% When including include files the files have been nested to a level of 16.
% The compiler will expand no further, since this may be a sign that
% recursion is used.
% \end{description}
#
# Parser
@ -1803,10 +1807,10 @@ unit_u_recompile_obj_and_asm_older=10032_U_Recompiling unit, obj and asm are old
unit_u_recompile_obj_older_than_asm=10033_U_Recompiling unit, obj is older than asm
% When you use the \var{-vu} flag, the compiler warns if the assembler
% file of the unit is older than the object file of the unit.
unit_u_start_parse_interface=10034_U_Parsing interface of $1
unit_u_parsing_interface=10034_U_Parsing interface of $1
% When you use the \var{-vu} flag, the compiler warns that it starts
% parsing the interface part of the unit
unit_u_start_parse_implementation=10035_U_Parsing implementation of $1
unit_u_parsing_implementation=10035_U_Parsing implementation of $1
% When you use the \var{-vu} flag, the compiler warns that it starts
% parsing the implementation part of the unit
unit_u_second_load_unit=10036_U_Second load for unit $1
@ -1837,6 +1841,55 @@ unit_u_ppu_invalid_fpumode=10042_U_Using a unit which was not compiled with corr
% Trying to compile code while using units which were not compiled with
% the same floating point format mode. Either all code should be compiled
% with FPU emulation on, or with FPU emulation off.
unit_u_loading_interface_units=10043_U_Loading interface units from $1
% When you use the \var{-vu} flag, the compiler warns that it starts
% loading the units defined in the interface part of the unit.
unit_u_loading_implementation_units=10044_U_Loading implementation units from $1
% When you use the \var{-vu} flag, the compiler warns that it starts
% loading the units defined in the implementation part of the unit.
unit_u_interface_crc_changed=10045_U_Interface CRC changed for unit $1
% When you use the \var{-vu} flag, the compiler warns that it the
% CRC calculated for the interface has been changed after the implementation
% has been parsed.
unit_u_implementation_crc_changed=10046_U_Implementation CRC changed for unit $1
% When you use the \var{-vu} flag, the compiler warns that it the
% CRC calculated has been changed after the implementation
% has been parsed.
unit_u_finished_compiling=10047_U_Finished compiling unit $1
% When you use the \var{-vu} flag, the compiler warns that it
% has finished compiling the unit.
unit_u_add_depend_to=10048_U_Add dependency of $1 to $2
% When you use the \var{-vu} flag, the compiler warns that it
% has added a dependency between the two units.
unit_u_no_reload_is_caller=10049_U_No reload, is caller: $1
% When you use the \var{-vu} flag, the compiler warns that it
% has will not reload the unit because it is the unit that wants
% to load this unit
unit_u_no_reload_in_second_compile=10050_U_No reload, already in second compile: $1
% When you use the \var{-vu} flag, the compiler warns that it
% has will not reload the unit because it is already in a second recompile
unit_u_flag_for_reload=10051_U_Flag for reload: $1
% When you use the \var{-vu} flag, the compiler warns that it
% has to reload the unit
unit_u_forced_reload=10052_U_Forced reloading
% When you use the \var{-vu} flag, the compiler warns that it
% has is reloading the unit because it was required
unit_u_previous_state=10053_U_Previous state of $1: $2
% When you use the \var{-vu} flag, the compiler shows the
% previous state of the unit
unit_u_second_compile_unit=10054_U_Already compiling $1, setting second compile
% When you use the \var{-vu} flag, the compiler warns that it starts
% recompiling a unit for the second time. This can happend with interdepend
% units.
unit_u_loading_unit=10055_U_Loading unit $1
% When you use the \var{-vu} flag, the compiler warns that it starts
% loading the unit.
unit_u_finished_loading_unit=10056_U_Finished loading unit $1
% When you use the \var{-vu} flag, the compiler warns that it finished
% loading the unit.
unit_u_registering_new_unit=10057_U_Registering new unit $1
% When you use the \var{-vu} flag, the compiler warns that it has
% found a new unit and registers it in the internal lists.
% \end{description}
# EndOfTeX

24
compiler/msgidx.inc
View File

@ -75,6 +75,7 @@ const
scan_w_appid_not_support=02059;
scan_w_appname_not_support=02060;
scan_e_string_exceeds_255_chars=02061;
scan_f_include_deep_ten=02062;
parser_e_syntax_error=03000;
parser_e_dont_nest_interrupt=03004;
parser_w_proc_directive_ignored=03005;
@ -559,8 +560,8 @@ const
unit_u_recompile_sharedlib_is_older=10031;
unit_u_recompile_obj_and_asm_older=10032;
unit_u_recompile_obj_older_than_asm=10033;
unit_u_start_parse_interface=10034;
unit_u_start_parse_implementation=10035;
unit_u_parsing_interface=10034;
unit_u_parsing_implementation=10035;
unit_u_second_load_unit=10036;
unit_u_check_time=10037;
unit_h_cond_not_set_in_last_compile=10038;
@ -568,6 +569,21 @@ const
unit_w_cant_compile_unit_with_changed_incfile=10040;
unit_h_source_modified=10041;
unit_u_ppu_invalid_fpumode=10042;
unit_u_loading_interface_units=10043;
unit_u_loading_implementation_units=10044;
unit_u_interface_crc_changed=10045;
unit_u_implementation_crc_changed=10046;
unit_u_finished_compiling=10047;
unit_u_add_depend_to=10048;
unit_u_no_reload_is_caller=10049;
unit_u_no_reload_in_second_compile=10050;
unit_u_flag_for_reload=10051;
unit_u_forced_reload=10052;
unit_u_previous_state=10053;
unit_u_second_compile_unit=10054;
unit_u_loading_unit=10055;
unit_u_finished_loading_unit=10056;
unit_u_registering_new_unit=10057;
option_usage=11000;
option_only_one_source_support=11001;
option_def_only_for_os2=11002;
@ -609,9 +625,9 @@ const
option_info=11024;
option_help_pages=11025;
MsgTxtSize = 34495;
MsgTxtSize = 35105;
MsgIdxMax : array[1..20] of longint=(
17,62,195,51,57,44,98,19,35,43,
17,63,195,51,57,44,98,19,35,58,
40,1,1,1,1,1,1,1,1,1
);

583
compiler/msgtxt.inc
View File

File diff suppressed because it is too large Load Diff

25
compiler/pmodules.pas
View File

@ -875,8 +875,7 @@ implementation
{ handle the global switches }
setupglobalswitches;
Comment(V_Used,'Loading interface units from '+current_module.modulename^);
// Message1(unit_u_start_parse_interface,current_module.modulename^);
Message1(unit_u_loading_interface_units,current_module.modulename^);
{ update status }
status.currentmodule:=current_module.realmodulename^;
@ -948,8 +947,7 @@ implementation
current_module.numberunits;
{ ... parse the declarations }
Comment(V_Used,'Parsing interface of '+current_module.modulename^);
// Message1(parser_u_parsing_interface,current_module.realmodulename^);
Message1(parser_u_parsing_interface,current_module.realmodulename^);
read_interface_declarations;
{ leave when we got an error }
@ -974,8 +972,7 @@ implementation
consume(_IMPLEMENTATION);
current_module.in_interface:=false;
Comment(V_Used,'Loading implementation units from '+current_module.modulename^);
// Message1(unit_u_start_parse_implementation,current_module.modulename^);
Message1(unit_u_loading_implementation_units,current_module.modulename^);
parse_only:=false;
@ -1030,10 +1027,9 @@ implementation
allow_special:=false;
{$endif Splitheap}
Comment(V_Used,'Parsing implementation of '+current_module.modulename^);
Message1(parser_u_parsing_implementation,current_module.modulename^);
if current_module.in_interface then
internalerror(200212285);
// Message1(parser_u_parsing_implementation,current_module.modulename^);
{ Compile the unit }
pd:=create_main_proc(current_module.modulename^+'_init',potype_unitinit,st);
@ -1187,13 +1183,11 @@ implementation
if not(cs_compilesystem in aktmoduleswitches) then
if store_interface_crc<>current_module.interface_crc then
Comment(V_Warning,current_module.ppufilename^+' Interface CRC changed '+
hexstr(store_crc,8)+'<>'+hexstr(current_module.interface_crc,8));
Message1(unit_u_interface_crc_changed,current_module.ppufilename^);
{$ifdef EXTDEBUG}
if not(cs_compilesystem in aktmoduleswitches) then
if (store_crc<>current_module.crc) and simplify_ppu then
Comment(V_Note,current_module.ppufilename^+' implementation CRC changed '+
hexstr(store_crc,8)+'<>'+hexstr(current_module.crc,8));
Message1(unit_u_implementation_crc_changed,current_module.ppufilename^);
{$endif EXTDEBUG}
{ remove static symtable (=refsymtable) here to save some mem }
@ -1215,7 +1209,7 @@ implementation
initfinalcode.free;
Comment(V_Used,'Finished compiling module '+current_module.modulename^);
Message1(unit_u_finished_compiling,current_module.modulename^);
end;
@ -1488,7 +1482,10 @@ So, all parameters are passerd into registers in sparc architecture.}
end.
{
$Log$
Revision 1.107 2003-05-22 21:31:35 peter
Revision 1.108 2003-05-25 10:27:12 peter
* moved Comment calls to messge file
Revision 1.107 2003/05/22 21:31:35 peter
* defer codegeneration for nested procedures
Revision 1.106 2003/05/15 18:58:53 peter