diff options
| author | Robert Dewar <dewar@adacore.com> | 2009-07-22 10:25:32 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-07-22 12:25:32 +0200 |
| commit | d1ced162c2d0525032df4c98d4d14dbcc7980de7 (patch) | |
| tree | 01d9b239998961b74425ecccd67bdd82369dfd29 /gcc/ada/a-ztedit.adb | |
| parent | ac3cbee587c9d65ba8d5be751c8c74ad9ba4c930 (diff) | |
| download | gcc-d1ced162c2d0525032df4c98d4d14dbcc7980de7.zip gcc-d1ced162c2d0525032df4c98d4d14dbcc7980de7.tar.gz gcc-d1ced162c2d0525032df4c98d4d14dbcc7980de7.tar.bz2 | |
s-stchop.adb, [...]: Make sure sources obey short-circuit style rule.
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.
From-SVN: r149921
Diffstat (limited to 'gcc/ada/a-ztedit.adb')
| -rw-r--r-- | gcc/ada/a-ztedit.adb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gcc/ada/a-ztedit.adb b/gcc/ada/a-ztedit.adb index 0c2d712..555e664 100644 --- a/gcc/ada/a-ztedit.adb +++ b/gcc/ada/a-ztedit.adb @@ -487,7 +487,8 @@ package body Ada.Wide_Wide_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; @@ -729,7 +730,7 @@ package body Ada.Wide_Wide_Text_IO.Editing is 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) := To_Wide (Rounded (Position)); if Rounded (Position) /= '0' then @@ -857,7 +858,7 @@ package body Ada.Wide_Wide_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 @@ -874,7 +875,7 @@ package body Ada.Wide_Wide_Text_IO.Editing is return Wide_Wide_String'(1 .. Last => ' '); - elsif Zero and Pic.Star_Fill then + elsif Zero and then Pic.Star_Fill then Last := Answer'Last; if Dollar then @@ -2084,7 +2085,7 @@ package body Ada.Wide_Wide_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; @@ -2100,7 +2101,7 @@ package body Ada.Wide_Wide_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; @@ -2469,14 +2470,15 @@ package body Ada.Wide_Wide_Text_IO.Editing is end case; -- Blank when zero either if the PIC does not contain a '9' or if - -- requested by the user and no '*' + -- 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); |