2014-01-29 Robert Dewar <dewar@adacore.com>

	* a-except-2005.adb, a-except.adb, a-excpol-abort.adb, a-exstat.adb,
	ali.adb, a-numaux.ads, a-numaux-darwin.ads, a-numaux-libc-x86.ads,
	a-numaux-vms.ads, a-numaux-vxworks.ads, a-numaux-x86.ads, aspects.ads,
	a-taside.adb, a-teioed.adb, a-textio.adb, a-textio.ads, atree.adb,
	atree.ads, a-witeio.adb, a-witeio.ads, a-wtedit.adb, a-ztedit.adb,
	a-ztexio.adb, bcheck.adb, binde.adb, checks.adb, comperr.adb,
	cstand.adb, debug_a.adb, einfo.ads, errout.adb, erroutc.adb,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb, exp_ch3.adb,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch9.adb, exp_dbug.adb,
	exp_disp.adb, exp_fixd.adb, exp_imgv.adb, exp_intr.adb, exp_util.adb,
	freeze.adb, frontend.adb, g-comlin.ads, g-mbdira.adb, gnat1drv.adb,
	gprep.adb, g-spipat.adb, i-cpp.ads, i-vxwork.ads, i-vxwork-x86.ads,
	krunch.ads, layout.adb, lib-load.adb, lib-writ.adb, lib-writ.ads,
	live.adb, namet.ads, osint.adb, osint-c.adb, output.ads, par.adb,
	par-ch10.adb, par-ch13.adb, par-ch3.adb, par-ch4.adb, par-ch5.adb,
	par-ch6.adb, par-ch9.adb, par-endh.adb, par-labl.adb, par-prag.adb,
	par-sync.adb, par-tchk.adb, par-util.adb, prj.adb, repinfo.adb,
	rtsfind.adb, s-arit64.adb, s-asthan-vms-alpha.adb,
	s-asthan-vms-ia64.adb, s-bignum.adb, scans.adb, scng.adb, s-dimmks.ads,
	sem_aggr.adb, sem_attr.adb, sem_aux.adb, sem_cat.adb, sem_ch10.adb,
	sem_ch12.adb, sem_ch13.adb, sem_ch13.ads, sem_ch3.adb, sem_ch4.adb,
	sem_ch5.adb, sem_ch6.adb, sem_ch8.adb, sem_disp.adb, sem_elab.adb,
	sem_elim.adb, sem_eval.adb, sem_intr.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_warn.adb, set_targ.adb, s-fatgen.adb,
	s-fatgen.ads, s-fileio.adb, s-imgcha.adb, s-imgrea.adb, sinfo.ads,
	sinput-c.adb, snames.ads-tmpl, s-os_lib.adb, sprint.adb,
	s-regpat.adb, s-secsta.adb, s-stalib.ads,
	s-stchop.adb, s-stoele.ads, stand.ads, s-taprop-solaris.adb,
	s-tasdeb-vms.adb, s-tasini.adb, s-tassta.adb, s-valdec.adb,
	s-valuti.adb, s-wchjis.adb, s-wchwts.adb, system.ads, system-vms_64.ads,
	system-vms-ia64.ads, treepr.adb, types.ads, uintp.adb, uname.adb,
	urealp.adb, usage.adb, vxaddr2line.adb: Minor reformatting.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207260 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 12 deletions

diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb
index 7d74ed13fa4..6db896fa72d 100644
--- a/gcc/ada/exp_dbug.adb
+++ b/gcc/ada/exp_dbug.adb
@@ -488,7 +488,7 @@ package body Exp_Dbug is
 
    --  If we get an exception, just figure it is a case that we cannot
    --  successfully handle using our current approach, since this is
-   --  only for debugging, no need to take the compilation with us!
+   --  only for debugging, no need to take the compilation with us.
 
    exception
       when others =>
@@ -1199,9 +1199,7 @@ package body Exp_Dbug is
 
       function Is_BNPE (S : Entity_Id) return Boolean is
       begin
-         return
-           Ekind (S) = E_Package
-             and then Is_Package_Body_Entity (S);
+         return Ekind (S) = E_Package and then Is_Package_Body_Entity (S);
       end Is_BNPE;
 
       --------------------
@@ -1212,7 +1210,7 @@ package body Exp_Dbug is
       begin
          --  If we got all the way to Standard, then we have certainly
          --  fully qualified the name, so set the flag appropriately,
-         --  and then return False, since we are most certainly done!
+         --  and then return False, since we are most certainly done.
 
          if S = Standard_Standard then
             Set_Has_Fully_Qualified_Name (Ent, True);
@@ -1221,13 +1219,10 @@ package body Exp_Dbug is
          --  Otherwise figure out if further qualification is required
 
          else
-            return
-              Is_Subprogram (Ent)
-                or else
-              Ekind (Ent) = E_Subprogram_Body
-                or else
-                  (Ekind (S) /= E_Block
-                    and then not Is_Dynamic_Scope (S));
+            return Is_Subprogram (Ent)
+              or else Ekind (Ent) = E_Subprogram_Body
+              or else (Ekind (S) /= E_Block
+                        and then not Is_Dynamic_Scope (S));
          end if;
       end Qualify_Needed;