diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-22 10:25:32 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-22 10:25:32 +0000 |
| commit | fbc89b916a7a004f25857943a4795a618a460ea4 (patch) | |
| tree | 01d9b239998961b74425ecccd67bdd82369dfd29 /gcc/ada/gnatchop.adb | |
| parent | 660c48c497a8e4e98d0430fbe584092e45350968 (diff) | |
| download | gcc-fbc89b916a7a004f25857943a4795a618a460ea4.tar.gz | |
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
Diffstat (limited to 'gcc/ada/gnatchop.adb')
| -rw-r--r-- | gcc/ada/gnatchop.adb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/ada/gnatchop.adb b/gcc/ada/gnatchop.adb index ec32c073d56..c72ac75b1f0 100644 --- a/gcc/ada/gnatchop.adb +++ b/gcc/ada/gnatchop.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2008, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2009, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -545,9 +545,9 @@ procedure Gnatchop is -- Find Start_Of_Prefix for J in reverse Current_Command'Range loop - if Current_Command (J) = '/' or - Current_Command (J) = Directory_Separator or - Current_Command (J) = ':' + if Current_Command (J) = '/' or else + Current_Command (J) = Directory_Separator or else + Current_Command (J) = ':' then Start_Of_Prefix := J + 1; exit; @@ -612,7 +612,7 @@ procedure Gnatchop is -- Skip past CR/LF or LF/CR combination - if (Source (Ptr) = ASCII.CR or Source (Ptr) = ASCII.LF) + if (Source (Ptr) = ASCII.CR or else Source (Ptr) = ASCII.LF) and then Source (Ptr) /= Source (Ptr - 1) then Ptr := Ptr + 1; @@ -973,7 +973,7 @@ procedure Gnatchop is begin -- Skip separators - while Source (Ptr) = ' ' or Source (Ptr) = ',' loop + while Source (Ptr) = ' ' or else Source (Ptr) = ',' loop Ptr := Ptr + 1; end loop; @@ -981,7 +981,8 @@ procedure Gnatchop is -- Find end-of-token - while (In_Quotes or else not (Source (Ptr) = ' ' or Source (Ptr) = ',')) + while (In_Quotes + or else not (Source (Ptr) = ' ' or else Source (Ptr) = ',')) and then Source (Ptr) >= ' ' loop if Source (Ptr) = '"' then @@ -1588,7 +1589,7 @@ procedure Gnatchop is Nam : String_Access; begin - if Success and Source_References and not Info.SR_Present then + if Success and then Source_References and then not Info.SR_Present then if FTE.SR_Name /= null then Nam := FTE.SR_Name; else |