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

* check for verbosity in verbose instead of comphook

Browse Source
This commit is contained in:
peter 2000-12-26 15:58:29 +00:00
parent ff388a41e2
commit 5a5ac3872b
2 changed files with 77 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
compiler/comphook.pas
View File

@ -234,82 +234,79 @@ var
hs : string; hs : string;
begin begin
def_comment:=false; { never stop } def_comment:=false; { never stop }
if (status.verbosity and Level)=Level then hs:='';
if not(status.use_gccoutput) then
begin
if (status.verbosity and Level)=V_Hint then
hs:=hintstr;
if (status.verbosity and Level)=V_Note then
hs:=notestr;
if (status.verbosity and Level)=V_Warning then
hs:=warningstr;
if (status.verbosity and Level)=V_Error then
hs:=errorstr;
if (status.verbosity and Level)=V_Fatal then
hs:=fatalstr;
end
else
begin
if (status.verbosity and Level)=V_Hint then
hs:=rh_warningstr;
if (status.verbosity and Level)=V_Note then
hs:=rh_warningstr;
if (status.verbosity and Level)=V_Warning then
hs:=rh_warningstr;
if (status.verbosity and Level)=V_Error then
hs:=rh_errorstr;
if (status.verbosity and Level)=V_Fatal then
hs:=rh_errorstr;
end;
if (Level<=V_ShowFile) and (status.currentsource<>'') and (status.currentline>0) then
begin begin
hs:=''; { Adding the column should not confuse RHIDE,
if not(status.use_gccoutput) then even if it does not yet use it PM
begin but only if it is after error or warning !! PM }
if (status.verbosity and Level)=V_Hint then if status.currentcolumn>0 then
hs:=hintstr;
if (status.verbosity and Level)=V_Note then
hs:=notestr;
if (status.verbosity and Level)=V_Warning then
hs:=warningstr;
if (status.verbosity and Level)=V_Error then
hs:=errorstr;
if (status.verbosity and Level)=V_Fatal then
hs:=fatalstr;
end
else
begin
if (status.verbosity and Level)=V_Hint then
hs:=rh_warningstr;
if (status.verbosity and Level)=V_Note then
hs:=rh_warningstr;
if (status.verbosity and Level)=V_Warning then
hs:=rh_warningstr;
if (status.verbosity and Level)=V_Error then
hs:=rh_errorstr;
if (status.verbosity and Level)=V_Fatal then
hs:=rh_errorstr;
end;
if (Level<=V_ShowFile) and (status.currentsource<>'') and (status.currentline>0) then
begin begin
{ Adding the column should not confuse RHIDE, if status.use_gccoutput then
even if it does not yet use it PM hs:=gccfilename(status.currentsource)+':'+tostr(status.currentline)+': '+hs+' '+
but only if it is after error or warning !! PM } tostr(status.currentcolumn)+': '+s
if status.currentcolumn>0 then
begin
if status.use_gccoutput then
hs:=gccfilename(status.currentsource)+':'+tostr(status.currentline)+': '+hs+' '+
tostr(status.currentcolumn)+': '+s
else
hs:=status.currentsource+'('+tostr(status.currentline)+
','+tostr(status.currentcolumn)+') '+hs+' '+s;
end
else else
begin hs:=status.currentsource+'('+tostr(status.currentline)+
if status.use_gccoutput then ','+tostr(status.currentcolumn)+') '+hs+' '+s;
hs:=gccfilename(status.currentsource)+': '+hs+' '+tostr(status.currentline)+': '+s
else
hs:=status.currentsource+'('+tostr(status.currentline)+') '+hs+' '+s;
end;
end end
else else
begin begin
if hs<>'' then if status.use_gccoutput then
hs:=hs+' '+s hs:=gccfilename(status.currentsource)+': '+hs+' '+tostr(status.currentline)+': '+s
else else
hs:=s; hs:=status.currentsource+'('+tostr(status.currentline)+') '+hs+' '+s;
end; end;
{$ifdef FPC} end
if status.use_stderr then else
begin begin
writeln(stderr,hs); if hs<>'' then
flush(stderr); hs:=hs+' '+s
end
else else
{$endif} hs:=s;
begin
if status.use_redir then
writeln(status.redirfile,hs)
else
writeln(hs);
end;
{$ifdef DEBUG}
def_gdb_stop(level);
{$endif DEBUG}
end; end;
{$ifdef FPC}
if status.use_stderr then
begin
writeln(stderr,hs);
flush(stderr);
end
else
{$endif}
begin
if status.use_redir then
writeln(status.redirfile,hs)
else
writeln(hs);
end;
{$ifdef DEBUG}
def_gdb_stop(level);
{$endif DEBUG}
end; end;
@ -366,7 +363,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.10 2000-12-25 00:07:25 peter Revision 1.11 2000-12-26 15:58:29 peter
* check for verbosity in verbose instead of comphook
Revision 1.10 2000/12/25 00:07:25 peter
+ new tlinkedlist class (merge of old tstringqueue,tcontainer and + new tlinkedlist class (merge of old tstringqueue,tcontainer and
tlinkedlist objects) tlinkedlist objects)

11
compiler/verbose.pas
View File

@ -405,6 +405,9 @@ var
(status.errornote and ((l and V_Note)<>0)) or (status.errornote and ((l and V_Note)<>0)) or
(status.errorhint and ((l and V_Hint)<>0)) then (status.errorhint and ((l and V_Hint)<>0)) then
inc(status.errorcount); inc(status.errorcount);
{ check verbosity level }
if (status.verbosity and l)<>l then
exit;
{ Create status info } { Create status info }
UpdateStatus; UpdateStatus;
{ Fix replacements } { Fix replacements }
@ -499,6 +502,9 @@ var
end; end;
end; end;
Delete(s,1,idx); Delete(s,1,idx);
{ check verbosity level }
if (status.verbosity and v)<>v then
exit;
{ fix status } { fix status }
UpdateStatus; UpdateStatus;
{ Fix replacements } { Fix replacements }
@ -624,7 +630,10 @@ var
end. end.
{ {
$Log$ $Log$
Revision 1.10 2000-12-25 00:07:30 peter Revision 1.11 2000-12-26 15:58:29 peter
* check for verbosity in verbose instead of comphook
Revision 1.10 2000/12/25 00:07:30 peter
+ new tlinkedlist class (merge of old tstringqueue,tcontainer and + new tlinkedlist class (merge of old tstringqueue,tcontainer and
tlinkedlist objects) tlinkedlist objects)