From d1ced162c2d0525032df4c98d4d14dbcc7980de7 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Wed, 22 Jul 2009 10:25:32 +0000 Subject: s-stchop.adb, [...]: Make sure sources obey short-circuit style rule. 2009-07-22 Robert Dewar * s-stchop.adb, a-direct.adb, a-ztexio.adb, gnatchop.adb, prj-proc.adb, make.adb, s-regpat.adb, ali-util.adb, a-ngcefu.adb, prep.adb, s-tassta.adb, a-tifiio.adb, a-textio.adb, prj.adb, uintp.adb, s-valrea.adb, a-ngelfu.adb, prepcomp.adb, sinput-l.adb, vms_conv.adb, errout.adb, g-alleve.adb, repinfo.adb, a-wtedit.adb, ali.adb, a-witeio.adb, prj-dect.adb, prj-nmsc.adb, sinput-c.adb, binde.adb, s-regexp.adb, s-imgrea.adb, a-teioed.adb, errutil.adb, prj-util.adb, a-ztedit.adb, gnatls.adb, prj-conf.adb, bcheck.adb, s-scaval.adb, erroutc.adb, osint.adb, a-strfix.adb, s-fileio.adb: Make sure sources obey short-circuit style rule. From-SVN: r149921 --- gcc/ada/errutil.adb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gcc/ada/errutil.adb') diff --git a/gcc/ada/errutil.adb b/gcc/ada/errutil.adb index 28db086..6a5bb69 100644 --- a/gcc/ada/errutil.adb +++ b/gcc/ada/errutil.adb @@ -261,11 +261,11 @@ package body Errutil is -- avoid junk extra messages from cascaded parsing errors if not (Errors.Table (Prev_Msg).Warn - or + or else Errors.Table (Prev_Msg).Style) or else (Errors.Table (Cur_Msg).Warn - or + or else Errors.Table (Cur_Msg).Style) then -- All tests passed, delete the message by simply returning @@ -296,8 +296,12 @@ package body Errutil is -- Bump appropriate statistics count - if Errors.Table (Cur_Msg).Warn or Errors.Table (Cur_Msg).Style then + if Errors.Table (Cur_Msg).Warn + or else + Errors.Table (Cur_Msg).Style + then Warnings_Detected := Warnings_Detected + 1; + else Total_Errors_Detected := Total_Errors_Detected + 1; -- cgit v1.1