2009-07-22 Robert Dewar <dewar@adacore.com>

	* 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.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149921 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 18 insertions, 21 deletions

diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index ada6e59d1f8..5b433187adb 100644
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -1029,20 +1029,20 @@ procedure Gnatls is
          end if;
 
          if Verbose_Mode then
-            if U.Preelab             or
-               U.No_Elab             or
-               U.Pure                or
-               U.Dynamic_Elab        or
-               U.Has_RACW            or
-               U.Remote_Types        or
-               U.Shared_Passive      or
-               U.RCI                 or
-               U.Predefined          or
-               U.Internal            or
-               U.Is_Generic          or
-               U.Init_Scalars        or
-               U.SAL_Interface       or
-               U.Body_Needed_For_SAL or
+            if U.Preelab             or else
+               U.No_Elab             or else
+               U.Pure                or else
+               U.Dynamic_Elab        or else
+               U.Has_RACW            or else
+               U.Remote_Types        or else
+               U.Shared_Passive      or else
+               U.RCI                 or else
+               U.Predefined          or else
+               U.Internal            or else
+               U.Is_Generic          or else
+               U.Init_Scalars        or else
+               U.SAL_Interface       or else
+               U.Body_Needed_For_SAL or else
                U.Elaborate_Body
             then
                Write_Eol;
@@ -1119,7 +1119,6 @@ procedure Gnatls is
                if U.Predefined then
                   Write_Str (" Predefined");
                end if;
-
             end if;
 
             declare
@@ -1160,7 +1159,7 @@ procedure Gnatls is
                   Write_Str ("     Restrictions violated =>");
 
                   --  For boolean restrictions, just display the name of the
-                  --  restriction; for valued restrictions, also display the
+                  --  restriction. For valued restrictions, also display the
                   --  restriction value.
 
                   for Restriction in All_Restrictions loop
@@ -1316,7 +1315,6 @@ procedure Gnatls is
                   --  Find the end of line
 
                   Last := Index;
-
                   while Last <= Buffer'Last
                     and then Buffer (Last) /= ASCII.LF
                     and then Buffer (Last) /= ASCII.CR
@@ -1330,10 +1328,9 @@ procedure Gnatls is
                      Add_File (Buffer (Index .. Last - 1));
                   end if;
 
-                  Index := Last;
-
                   --  Find the beginning of the next line
 
+                  Index := Last;
                   while Buffer (Index) = ASCII.CR or else
                         Buffer (Index) = ASCII.LF
                   loop
@@ -1559,8 +1556,8 @@ begin
       Exit_Program (E_Fatal);
    end if;
 
-   --  Add the source and object directories specified on the
-   --  command line, if any, to the searched directories.
+   --  Add the source and object directories specified on the command line, if
+   --  any, to the searched directories.
 
    while First_Source_Dir /= null loop
       Add_Src_Search_Dir (First_Source_Dir.Value.all);