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/prep.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/prep.adb')
| -rw-r--r-- | gcc/ada/prep.adb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gcc/ada/prep.adb b/gcc/ada/prep.adb index 52328b2..9a76dc9 100644 --- a/gcc/ada/prep.adb +++ b/gcc/ada/prep.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2002-2008, Free Software Foundation, Inc. -- +-- Copyright (C) 2002-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- -- @@ -926,7 +926,7 @@ package body Prep is goto Cleanup; end if; - elsif Token = Tok_End_Of_Line or Token = Tok_EOF then + elsif Token = Tok_End_Of_Line or else Token = Tok_EOF then Data := (Symbol => Symbol_Name, Original => Original_Name, On_The_Command_Line => False, @@ -1008,7 +1008,7 @@ package body Prep is <<Cleanup>> Set_Ignore_Errors (To => True); - while Token /= Tok_End_Of_Line and Token /= Tok_EOF loop + while Token /= Tok_End_Of_Line and then Token /= Tok_EOF loop Scan.all; end loop; @@ -1058,7 +1058,7 @@ package body Prep is procedure Output_Line (From, To : Source_Ptr) is begin - if Deleting or Preprocessor_Line then + if Deleting or else Preprocessor_Line then if Blank_Deleted_Lines then New_EOL.all; @@ -1145,8 +1145,9 @@ package body Prep is New_State : constant Pp_State := (If_Ptr => If_Ptr, Else_Ptr => 0, - Deleting => Deleting or (not Cond), - Match_Seen => Deleting or Cond); + Deleting => Deleting + or else not Cond, + Match_Seen => Deleting or else Cond); begin Pp_States.Increment_Last; @@ -1408,7 +1409,7 @@ package body Prep is end if; end if; - pragma Assert (Token = Tok_End_Of_Line or Token = Tok_EOF); + pragma Assert (Token = Tok_End_Of_Line or else Token = Tok_EOF); -- At this point, the token is either end of line or EOF. -- The line to possibly output stops just before the token. |