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, 10 insertions, 8 deletions

diff --git a/gcc/ada/a-teioed.adb b/gcc/ada/a-teioed.adb
index 2d6a3a9b75a..e2408a45194 100644
--- a/gcc/ada/a-teioed.adb
+++ b/gcc/ada/a-teioed.adb
@@ -313,7 +313,8 @@ package body Ada.Text_IO.Editing is
 
       for J in reverse Attrs.Start_Of_Int .. Attrs.End_Of_Int loop
          while Answer (Position) /= '9'
-           and Answer (Position) /= Pic.Floater
+                 and then
+               Answer (Position) /= Pic.Floater
          loop
             if Answer (Position) = '_' then
                Answer (Position) := Separator_Character;
@@ -560,7 +561,7 @@ package body Ada.Text_IO.Editing is
             Last     := Pic.Radix_Position + 1;
 
             for J in Last .. Answer'Last loop
-               if Answer (J) = '9' or Answer (J) = Pic.Floater then
+               if Answer (J) = '9' or else Answer (J) = Pic.Floater then
                   Answer (J) := Rounded (Position);
 
                   if Rounded (Position) /= '0' then
@@ -694,7 +695,7 @@ package body Ada.Text_IO.Editing is
 
       --  Now get rid of Blank_when_Zero and complete Star fill
 
-      if Zero and Pic.Blank_When_Zero then
+      if Zero and then Pic.Blank_When_Zero then
 
          --  Value is zero, and blank it
 
@@ -711,7 +712,7 @@ package body Ada.Text_IO.Editing is
 
          return String'(1 .. Last => ' ');
 
-      elsif Zero and Pic.Star_Fill then
+      elsif Zero and then Pic.Star_Fill then
          Last := Answer'Last;
 
          if Dollar then
@@ -2032,7 +2033,7 @@ package body Ada.Text_IO.Editing is
                Pic.Picture.Expanded (Index) := 'C';
                Skip;
 
-               if Look = 'R' or Look = 'r' then
+               if Look = 'R' or else Look = 'r' then
                   Pic.Second_Sign := Index;
                   Pic.Picture.Expanded (Index) := 'R';
                   Skip;
@@ -2048,7 +2049,7 @@ package body Ada.Text_IO.Editing is
                Pic.Picture.Expanded (Index) := 'D';
                Skip;
 
-               if Look = 'B' or Look = 'b' then
+               if Look = 'B' or else Look = 'b' then
                   Pic.Second_Sign := Index;
                   Pic.Picture.Expanded (Index) := 'B';
                   Skip;
@@ -2433,11 +2434,12 @@ package body Ada.Text_IO.Editing is
          --  requested by the user and no '*'.
 
          Pic.Blank_When_Zero :=
-           (Computed_BWZ or Pic.Blank_When_Zero) and not Pic.Star_Fill;
+           (Computed_BWZ or else Pic.Blank_When_Zero)
+             and then not Pic.Star_Fill;
 
          --  Star fill if '*' and no '9'
 
-         Pic.Star_Fill := Pic.Star_Fill and Computed_BWZ;
+         Pic.Star_Fill := Pic.Star_Fill and then Computed_BWZ;
 
          if not At_End then
             Set_State (Reject);