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/prj-util.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/prj-util.adb')
| -rw-r--r-- | gcc/ada/prj-util.adb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb index 897e7f0..159ee83 100644 --- a/gcc/ada/prj-util.adb +++ b/gcc/ada/prj-util.adb @@ -183,7 +183,7 @@ package body Prj.Util is if Builder_Package /= No_Package then Executable_Suffix_Name := Project.Config.Executable_Suffix; - if Executable = Nil_Variable_Value and Ada_Main then + if Executable = Nil_Variable_Value and then Ada_Main then Get_Name_String (Main); -- Try as index the name minus the implementation suffix or minus @@ -562,7 +562,7 @@ package body Prj.Util is Real_Index_1 := Index; - if not Element.Index_Case_Sensitive or Force_Lower_Case_Index then + if not Element.Index_Case_Sensitive or else Force_Lower_Case_Index then if Index /= All_Other_Names then Get_Name_String (Index); To_Lower (Name_Buffer (1 .. Name_Len)); @@ -574,7 +574,9 @@ package body Prj.Util is Element := In_Tree.Array_Elements.Table (Current); Real_Index_2 := Element.Index; - if not Element.Index_Case_Sensitive or Force_Lower_Case_Index then + if not Element.Index_Case_Sensitive + or else Force_Lower_Case_Index + then if Element.Index /= All_Other_Names then Get_Name_String (Element.Index); To_Lower (Name_Buffer (1 .. Name_Len)); |