3psoccon.ads, [...]: Files added.

2003-10-21  Arnaud Charlet  <charlet@act-europe.fr>

	* 3psoccon.ads, 3veacodu.adb, 3vexpect.adb, 3vsoccon.ads,
	3vsocthi.adb, 3vsocthi.ads, 3vtrasym.adb, 3zsoccon.ads,
	3zsocthi.adb, 3zsocthi.ads, 50system.ads, 51system.ads,
	55system.ads, 56osinte.adb, 56osinte.ads, 56taprop.adb,
	56taspri.ads, 56tpopsp.adb, 57system.ads, 58system.ads,
	59system.ads, 5aml-tgt.adb, 5bml-tgt.adb, 5csystem.ads,
	5dsystem.ads, 5fosinte.adb, 5gml-tgt.adb, 5hml-tgt.adb,
	5isystem.ads, 5lparame.adb, 5msystem.ads, 5psystem.ads,
	5sml-tgt.adb, 5sosprim.adb, 5stpopsp.adb, 5tsystem.ads,
	5usystem.ads, 5vml-tgt.adb, 5vsymbol.adb, 5vtraent.adb,
	5vtraent.ads, 5wml-tgt.adb, 5xparame.ads, 5xsystem.ads,
	5xvxwork.ads, 5yparame.ads, 5ytiitho.adb, 5zinit.adb,
	5zml-tgt.adb, 5zparame.ads, 5ztaspri.ads, 5ztfsetr.adb,
	5zthrini.adb, 5ztiitho.adb, 5ztpopsp.adb, 7stfsetr.adb,
	7straces.adb, 7strafor.adb, 7strafor.ads, 7stratas.adb,
	a-excach.adb, a-exexda.adb, a-exexpr.adb, a-exextr.adb,
	a-exstat.adb, a-strsup.adb, a-strsup.ads, a-stwisu.adb,
	a-stwisu.ads, bld.adb, bld.ads, bld-io.adb,
	bld-io.ads, clean.adb, clean.ads, ctrl_c.c,
	erroutc.adb, erroutc.ads, errutil.adb, errutil.ads,
	err_vars.ads, final.c, g-arrspl.adb, g-arrspl.ads,
	g-boubuf.adb, g-boubuf.ads, g-boumai.ads, g-bubsor.adb,
	g-bubsor.ads, g-comver.adb, g-comver.ads, g-ctrl_c.ads,
	g-dynhta.adb, g-dynhta.ads, g-eacodu.adb, g-excact.adb,
	g-excact.ads, g-heasor.adb, g-heasor.ads, g-memdum.adb,
	g-memdum.ads, gnatclean.adb, gnatsym.adb, g-pehage.adb,
	g-pehage.ads, g-perhas.ads, gpr2make.adb, gpr2make.ads,
	gprcmd.adb, gprep.adb, gprep.ads, g-semaph.adb,
	g-semaph.ads, g-string.adb, g-string.ads, g-strspl.ads,
	g-wistsp.ads, i-vthrea.adb, i-vthrea.ads, i-vxwoio.adb,
	i-vxwoio.ads, Makefile.generic, Makefile.prolog, Makefile.rtl,
	prep.adb, prep.ads, prepcomp.adb, prepcomp.ads,
	prj-err.adb, prj-err.ads, s-boarop.ads, s-carsi8.adb,
	s-carsi8.ads, s-carun8.adb, s-carun8.ads, s-casi16.adb,
	s-casi16.ads, s-casi32.adb, s-casi32.ads, s-casi64.adb,
	s-casi64.ads, s-casuti.adb, s-casuti.ads, s-caun16.adb,
	s-caun16.ads, s-caun32.adb, s-caun32.ads, s-caun64.adb,
	s-caun64.ads, scng.adb, scng.ads, s-exnint.adb,
	s-exnllf.adb, s-exnlli.adb, s-expint.adb, s-explli.adb,
	s-geveop.adb, s-geveop.ads, s-hibaen.ads, s-htable.adb,
	s-htable.ads, sinput-c.adb, sinput-c.ads, s-memcop.ads,
	socket.c, s-purexc.ads, s-scaval.adb, s-stopoo.adb,
	s-strcom.adb, s-strcom.ads, s-strxdr.adb, s-rident.ads,
	s-thread.adb, s-thread.ads, s-tpae65.adb, s-tpae65.ads,
	s-tporft.adb, s-traent.adb, s-traent.ads, styleg.adb,
	styleg.ads, styleg-c.adb, styleg-c.ads, s-veboop.adb,
	s-veboop.ads, s-vector.ads, symbols.adb, symbols.ads,
	tb-alvms.c, tb-alvxw.c, tempdir.adb, tempdir.ads,
	vms_conv.ads, vms_conv.adb, vms_data.ads,
	vxaddr2line.adb: Files added. Merge with ACT tree.

	* 4dintnam.ads, 4mintnam.ads, 4uintnam.ads, 52system.ads,
	5dosinte.ads, 5etpopse.adb, 5mosinte.ads, 5qosinte.adb,
	5qosinte.ads, 5qstache.adb, 5qtaprop.adb, 5qtaspri.ads,
	5stpopse.adb, 5uintman.adb, 5uosinte.ads, adafinal.c,
	g-enblsp.adb, io-aux.c, scn-nlit.adb, scn-slit.adb,
	s-exnflt.ads, s-exngen.adb, s-exngen.ads, s-exnlfl.ads,
	s-exnlin.ads, s-exnsfl.ads, s-exnsin.ads, s-exnssi.ads,
	s-expflt.ads, s-expgen.adb, s-expgen.ads, s-explfl.ads,
	s-explin.ads, s-expllf.ads, s-expsfl.ads, s-expsin.ads,
	s-expssi.ads, style.adb: Files removed. Merge with ACT tree.

	* 1ic.ads, 31soccon.ads, 31soliop.ads, 3asoccon.ads,
	3bsoccon.ads, 3gsoccon.ads, 3hsoccon.ads, 3ssoccon.ads,
	3ssoliop.ads, 3wsoccon.ads, 3wsocthi.adb, 3wsocthi.ads,
	3wsoliop.ads, 41intnam.ads, 42intnam.ads, 4aintnam.ads,
	4cintnam.ads, 4gintnam.ads, 4hexcpol.adb, 4hintnam.ads,
	4lintnam.ads, 4nintnam.ads, 4ointnam.ads, 4onumaux.ads,
	4pintnam.ads, 4sintnam.ads, 4vcaldel.adb, 4vcalend.adb,
	4vintnam.ads, 4wexcpol.adb, 4wintnam.ads, 4zintnam.ads,
	51osinte.adb, 51osinte.ads, 52osinte.adb, 52osinte.ads,
	53osinte.ads, 54osinte.ads, 5aosinte.adb, 5aosinte.ads,
	5asystem.ads, 5ataprop.adb, 5atasinf.ads, 5ataspri.ads,
	5atpopsp.adb, 5avxwork.ads, 5bosinte.adb, 5bosinte.ads,
	5bsystem.ads, 5cosinte.ads, 5esystem.ads, 5fintman.adb,
	5fosinte.ads, 5fsystem.ads, 5ftaprop.adb, 5ftasinf.ads,
	5ginterr.adb, 5gintman.adb, 5gmastop.adb, 5gosinte.ads,
	5gproinf.ads, 5gsystem.ads, 5gtaprop.adb, 5gtasinf.ads,
	5gtpgetc.adb, 5hosinte.adb, 5hosinte.ads, 5hsystem.ads,
	5htaprop.adb, 5htaspri.ads, 5htraceb.adb, 5iosinte.adb,
	5itaprop.adb, 5itaspri.ads, 5ksystem.ads, 5kvxwork.ads,
	5lintman.adb, 5lml-tgt.adb, 5losinte.ads, 5lsystem.ads,
	5mvxwork.ads, 5ninmaop.adb, 5nintman.adb, 5nosinte.ads,
	5ntaprop.adb, 5ntaspri.ads, 5ointerr.adb, 5omastop.adb,
	5oosinte.adb, 5oosinte.ads, 5oosprim.adb, 5oparame.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5posinte.ads,
	5posprim.adb, 5pvxwork.ads, 5sintman.adb, 5sosinte.adb,
	5sosinte.ads, 5ssystem.ads, 5staprop.adb, 5stasinf.ads,
	5staspri.ads, 5svxwork.ads, 5tosinte.ads, 5vasthan.adb,
	5vinmaop.adb, 5vinterr.adb, 5vintman.adb, 5vintman.ads,
	5vmastop.adb, 5vosinte.adb, 5vosinte.ads, 5vosprim.adb,
	5vsystem.ads, 5vtaprop.adb, 5vtaspri.ads, 5vtpopde.adb,
	5vtpopde.ads, 5wgloloc.adb, 5wintman.adb, 5wmemory.adb,
	5wosprim.adb, 5wsystem.ads, 5wtaprop.adb, 5wtaspri.ads,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zosprim.adb, 5zsystem.ads, 5ztaprop.adb,
	6vcpp.adb, 6vcstrea.adb, 6vinterf.ads, 7sinmaop.adb,
	7sintman.adb, 7sosinte.adb, 7sosprim.adb, 7staprop.adb,
	7staspri.ads, 7stpopsp.adb, 7straceb.adb, 9drpc.adb,
	a-caldel.adb, a-caldel.ads, a-charac.ads, a-colien.ads,
	a-comlin.adb, adaint.c, adaint.h, ada-tree.def,
	a-diocst.adb, a-diocst.ads, a-direio.adb, a-except.adb,
	a-except.ads, a-excpol.adb, a-exctra.adb, a-exctra.ads,
	a-filico.adb, a-interr.adb, a-intsig.adb, a-intsig.ads,
	ali.adb, ali.ads, ali-util.adb, ali-util.ads,
	a-ngcefu.adb, a-ngcoty.adb, a-ngelfu.adb, a-nudira.adb,
	a-nudira.ads, a-nuflra.adb, a-nuflra.ads, a-reatim.adb,
	a-reatim.ads, a-retide.ads, a-sequio.adb, a-siocst.adb,
	a-siocst.ads, a-ssicst.adb, a-ssicst.ads, a-strbou.adb,
	a-strbou.ads, a-strfix.adb, a-strmap.adb, a-strsea.ads,
	a-strunb.adb, a-strunb.ads, a-ststio.adb, a-stunau.adb,
	a-stunau.ads, a-stwibo.adb, a-stwibo.ads, a-stwifi.adb,
	a-stwima.adb, a-stwiun.adb, a-stwiun.ads, a-tags.adb,
	a-tags.ads, a-tasatt.adb, a-taside.adb, a-teioed.adb,
	a-textio.adb, a-textio.ads, a-tienau.adb, a-tifiio.adb,
	a-tiflau.adb, a-tiflio.adb, a-tigeau.adb, a-tigeau.ads,
	a-tiinau.adb, a-timoau.adb, a-tiocst.adb, a-tiocst.ads,
	atree.adb, atree.ads, a-witeio.adb, a-witeio.ads,
	a-wtcstr.adb, a-wtcstr.ads, a-wtdeio.adb, a-wtedit.adb,
	a-wtenau.adb, a-wtflau.adb, a-wtinau.adb, a-wtmoau.adb,
	bcheck.adb, binde.adb, bindgen.adb, bindusg.adb,
	checks.adb, checks.ads, cio.c, comperr.adb,
	comperr.ads, csets.adb, cstand.adb, cstreams.c,
	debug_a.adb, debug_a.ads, debug.adb, decl.c,
	einfo.adb, einfo.ads, errout.adb, errout.ads,
	eval_fat.adb, eval_fat.ads, exp_aggr.adb, expander.adb,
	expander.ads, exp_attr.adb, exp_ch11.adb, exp_ch13.adb,
	exp_ch2.adb, exp_ch3.adb, exp_ch3.ads, exp_ch4.adb,
	exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch8.adb, exp_ch9.adb, exp_code.adb, exp_dbug.adb,
	exp_dbug.ads, exp_disp.adb, exp_dist.adb, expect.c,
	exp_fixd.adb, exp_imgv.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_strm.ads, exp_tss.adb,
	exp_tss.ads, exp_util.adb, exp_util.ads, exp_vfpt.adb,
	fe.h, fmap.adb, fmap.ads, fname.adb,
	fname.ads, fname-uf.adb, fname-uf.ads, freeze.adb,
	freeze.ads, frontend.adb, g-awk.adb, g-awk.ads,
	g-busora.adb, g-busora.ads, g-busorg.adb, g-busorg.ads,
	g-casuti.adb, g-casuti.ads, g-catiio.adb, g-catiio.ads,
	g-cgi.adb, g-cgi.ads, g-cgicoo.adb, g-cgicoo.ads,
	g-cgideb.adb, g-cgideb.ads, g-comlin.adb, g-comlin.ads,
	g-crc32.adb, g-crc32.ads, g-debpoo.adb, g-debpoo.ads,
	g-debuti.adb, g-debuti.ads, g-diopit.adb, g-diopit.ads,
	g-dirope.adb, g-dirope.ads, g-dyntab.adb, g-dyntab.ads,
	g-except.ads, g-exctra.adb, g-exctra.ads, g-expect.adb,
	g-expect.ads, g-hesora.adb, g-hesora.ads, g-hesorg.adb,
	g-hesorg.ads, g-htable.adb, g-htable.ads, gigi.h,
	g-io.adb, g-io.ads, g-io_aux.adb, g-io_aux.ads,
	g-locfil.adb, g-locfil.ads, g-md5.adb, g-md5.ads,
	gmem.c, gnat1drv.adb, gnatbind.adb, gnatchop.adb,
	gnatcmd.adb, gnatfind.adb, gnatkr.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmake.adb, gnatmem.adb,
	gnatname.adb, gnatprep.adb, gnatprep.ads, gnatpsta.adb,
	gnatxref.adb, g-os_lib.adb, g-os_lib.ads, g-regexp.adb,
	g-regexp.ads, g-regist.adb, g-regist.ads, g-regpat.adb,
	g-regpat.ads, g-soccon.ads, g-socket.adb, g-socket.ads,
	g-socthi.adb, g-socthi.ads, g-soliop.ads, g-souinf.ads,
	g-speche.adb, g-speche.ads, g-spipat.adb, g-spipat.ads,
	g-spitbo.adb, g-spitbo.ads, g-sptabo.ads, g-sptain.ads,
	g-sptavs.ads, g-table.adb, g-table.ads, g-tasloc.adb,
	g-tasloc.ads, g-thread.adb, g-thread.ads, g-traceb.adb,
	g-traceb.ads, g-trasym.adb, g-trasym.ads, hostparm.ads,
	i-c.ads, i-cobol.adb, i-cpp.adb, i-cstrea.ads,
	i-cstrin.adb, i-cstrin.ads, impunit.adb, init.c,
	inline.adb, interfac.ads, i-pacdec.ads, itypes.adb,
	itypes.ads, i-vxwork.ads, lang.opt, lang-specs.h,
	layout.adb, lib.adb, lib.ads, lib-list.adb,
	lib-load.adb, lib-load.ads, lib-sort.adb, lib-util.adb,
	lib-writ.adb, lib-writ.ads, lib-xref.adb, lib-xref.ads,
	link.c, live.adb, make.adb, make.ads,
	Makefile.adalib, Makefile.in, Make-lang.in, makeusg.adb,
	mdll.adb, mdll-fil.adb, mdll-fil.ads, mdll-utl.adb,
	mdll-utl.ads, memroot.adb, memroot.ads, memtrack.adb,
	misc.c, mkdir.c, mlib.adb, mlib.ads,
	mlib-fil.adb, mlib-fil.ads, mlib-prj.adb, mlib-prj.ads,
	mlib-tgt.adb, mlib-tgt.ads, mlib-utl.adb, mlib-utl.ads,
	namet.adb, namet.ads, namet.h, nlists.ads,
	nlists.h, nmake.adt, opt.adb, opt.ads,
	osint.adb, osint.ads, osint-b.adb, osint-c.adb,
	par.adb, par-ch10.adb, par-ch11.adb, par-ch2.adb,
	par-ch3.adb, par-ch4.adb, par-ch5.adb, par-ch6.adb,
	par-ch9.adb, par-endh.adb, par-labl.adb, par-load.adb,
	par-prag.adb, par-sync.adb, par-tchk.adb, par-util.adb,
	prj.adb, prj.ads, prj-attr.adb, prj-attr.ads,
	prj-com.adb, prj-com.ads, prj-dect.adb, prj-dect.ads,
	prj-env.adb, prj-env.ads, prj-ext.adb, prj-ext.ads,
	prj-makr.adb, prj-makr.ads, prj-nmsc.adb, prj-nmsc.ads,
	prj-pars.adb, prj-pars.ads, prj-part.adb, prj-part.ads,
	prj-pp.adb, prj-pp.ads, prj-proc.adb, prj-proc.ads,
	prj-strt.adb, prj-strt.ads, prj-tree.adb, prj-tree.ads,
	prj-util.adb, prj-util.ads, raise.c, raise.h,
	repinfo.adb, repinfo.h, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-addima.ads,
	s-arit64.adb, s-assert.adb, s-assert.ads, s-atacco.adb,
	s-atacco.ads, s-auxdec.adb, s-auxdec.ads, s-bitops.adb,
	scans.ads, scn.adb, scn.ads, s-crc32.adb,
	s-crc32.ads, s-direio.adb, sem.adb, sem.ads,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_case.ads, sem_cat.adb, sem_cat.ads, sem_ch10.adb,
	sem_ch11.adb, sem_ch12.adb, sem_ch12.ads, sem_ch13.adb,
	sem_ch13.ads, sem_ch3.adb, sem_ch3.ads, sem_ch4.adb,
	sem_ch5.adb, sem_ch5.ads, sem_ch6.adb, sem_ch6.ads,
	sem_ch7.adb, sem_ch7.ads, sem_ch8.adb, sem_ch8.ads,
	sem_ch9.adb, sem_disp.adb, sem_disp.ads, sem_dist.adb,
	sem_elab.adb, sem_eval.adb, sem_eval.ads, sem_intr.adb,
	sem_maps.adb, sem_mech.adb, sem_prag.adb, sem_prag.ads,
	sem_res.adb, sem_res.ads, sem_type.adb, sem_type.ads,
	sem_util.adb, sem_util.ads, sem_warn.adb, s-errrep.adb,
	s-errrep.ads, s-exctab.adb, s-exctab.ads, s-exnint.ads,
	s-exnllf.ads, s-exnlli.ads, s-expint.ads, s-explli.ads,
	s-expuns.ads, s-fatflt.ads, s-fatgen.adb, s-fatgen.ads,
	s-fatlfl.ads, s-fatllf.ads, s-fatsfl.ads, s-fileio.adb,
	s-fileio.ads, s-finimp.adb, s-finimp.ads, s-finroo.adb,
	s-finroo.ads, sfn_scan.adb, s-gloloc.adb, s-gloloc.ads,
	s-imgdec.adb, s-imgenu.adb, s-imgrea.adb, s-imgwch.adb,
	sinfo.adb, sinfo.ads, s-inmaop.ads, sinput.adb,
	sinput.ads, sinput-d.adb, sinput-l.adb, sinput-l.ads,
	sinput-p.adb, sinput-p.ads, s-interr.adb, s-interr.ads,
	s-intman.ads, s-maccod.ads, s-mastop.adb, s-mastop.ads,
	s-memory.adb, s-memory.ads, snames.adb, snames.ads,
	snames.h, s-osprim.ads, s-parame.ads, s-parint.ads,
	s-pooloc.adb, s-pooloc.ads, s-poosiz.adb, sprint.adb,
	s-proinf.ads, s-scaval.ads, s-secsta.adb, s-secsta.ads,
	s-sequio.adb, s-shasto.adb, s-shasto.ads, s-soflin.ads,
	s-stache.adb, s-stache.ads, s-stalib.adb, s-stalib.ads,
	s-stoele.ads, s-stopoo.ads, s-stratt.adb, s-stratt.ads,
	s-strops.adb, s-strops.ads, s-taasde.adb, s-taasde.ads,
	s-tadeca.adb, s-tadeca.ads, s-tadert.adb, s-tadert.ads,
	s-taenca.adb, s-taenca.ads, s-taprob.adb, s-taprob.ads,
	s-taprop.ads, s-tarest.adb, s-tarest.ads, s-tasdeb.adb,
	s-tasdeb.ads, s-tasinf.adb, s-tasinf.ads, s-tasini.adb,
	s-tasini.ads, s-taskin.adb, s-taskin.ads, s-tasque.adb,
	s-tasque.ads, s-tasren.adb, s-tasren.ads, s-tasres.ads,
	s-tassta.adb, s-tassta.ads, s-tasuti.adb, s-tasuti.ads,
	s-tataat.adb, s-tataat.ads, s-tpinop.adb, s-tpinop.ads,
	s-tpoben.adb, s-tpoben.ads, s-tpobop.adb, s-tpobop.ads,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	stringt.adb, stringt.ads, stringt.h, style.ads,
	stylesw.adb, stylesw.ads, s-unstyp.ads, s-vaflop.ads,
	s-valrea.adb, s-valuti.adb, s-vercon.adb, s-vmexta.adb,
	s-wchcnv.ads, s-wchcon.ads, s-widcha.adb, switch.adb,
	switch.ads, switch-b.adb, switch-c.adb, switch-m.adb,
	s-wwdcha.adb, s-wwdwch.adb, sysdep.c, system.ads,
	table.adb, table.ads, targparm.adb, targparm.ads,
	targtyps.c, tbuild.adb, tbuild.ads, tracebak.c,
	trans.c, tree_io.adb, treepr.adb, treeprs.adt,
	ttypes.ads, types.ads, types.h, uintp.adb,
	uintp.ads, uintp.h, uname.adb, urealp.adb,
	urealp.ads, urealp.h, usage.adb, utils2.c,
	utils.c, validsw.adb, validsw.ads, widechar.adb,
	xeinfo.adb, xnmake.adb, xref_lib.adb, xref_lib.ads,
	xr_tabls.adb, xr_tabls.ads, xtreeprs.adb, xsnames.adb,
	einfo.h, sinfo.h, treeprs.ads, nmake.ads, nmake.adb,
	gnatvsn.ads: Merge with ACT tree.

	* gnatvsn.adb: Rewritten in a simpler and more efficient way.

From-SVN: r72751

1 files changed, 333 insertions, 159 deletions

diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb
index 2aa339ee826..caaf9263b45 100644
--- a/gcc/ada/sem_ch7.adb
+++ b/gcc/ada/sem_ch7.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2002, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2003, 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- --
@@ -85,11 +85,10 @@ package body Sem_Ch7 is
    -- Local Subprograms --
    -----------------------
 
-   procedure Install_Composite_Operations (P : Entity_Id);
-   --  Composite types declared in the current scope may depend on
-   --  types that were private at the point of declaration, and whose
-   --  full view is now in  scope. Indicate that the corresponding
-   --  operations on the composite type are available.
+   procedure Install_Package_Entity (Id : Entity_Id);
+   --  Basic procedure for the previous two. Places one entity on its
+   --  visibility chain, and recurses on the visible part if the entity
+   --  is an inner package.
 
    function Is_Private_Base_Type (E : Entity_Id) return Boolean;
    --  True for a private type that is not a subtype.
@@ -100,10 +99,6 @@ package body Sem_Ch7 is
    --  only if we are in the immediate scope of the private dependent.
    --  Should this predicate be tightened further???
 
-   procedure Preserve_Full_Attributes (Priv, Full : Entity_Id);
-   --  Copy to the private declaration the attributes of the full view
-   --  that need to be available for the partial view also.
-
    procedure Declare_Inherited_Private_Subprograms (Id : Entity_Id);
    --  Called upon entering the private part of a public child package
    --  and the body of a nested package, to potentially declare certain
@@ -111,7 +106,7 @@ package body Sem_Ch7 is
    --  part, but whose declaration was deferred because the parent
    --  operation was private and not visible at that point. These
    --  subprograms are located by traversing the visible part declarations
-   --  looking for nonprivate type extensions and then examining each of
+   --  looking for non-private type extensions and then examining each of
    --  the primitive operations of such types to find those that were
    --  inherited but declared with a special internal name. Each such
    --  operation is now declared as an operation with a normal name (using
@@ -133,6 +128,39 @@ package body Sem_Ch7 is
       New_N            : Node_Id;
       Pack_Decl        : Node_Id;
 
+      procedure Install_Composite_Operations (P : Entity_Id);
+      --  Composite types declared in the current scope may depend on
+      --  types that were private at the point of declaration, and whose
+      --  full view is now in  scope. Indicate that the corresponding
+      --  operations on the composite type are available.
+
+      ----------------------------------
+      -- Install_Composite_Operations --
+      ----------------------------------
+
+      procedure Install_Composite_Operations (P : Entity_Id) is
+         Id : Entity_Id;
+
+      begin
+         Id := First_Entity (P);
+
+         while Present (Id) loop
+
+            if Is_Type (Id)
+              and then (Is_Limited_Composite (Id)
+                         or else Is_Private_Composite (Id))
+              and then No (Private_Component (Id))
+            then
+               Set_Is_Limited_Composite (Id, False);
+               Set_Is_Private_Composite (Id, False);
+            end if;
+
+            Next_Entity (Id);
+         end loop;
+      end Install_Composite_Operations;
+
+   --  Start of processing for Analyze_Package_Body
+
    begin
       --  Find corresponding package specification, and establish the
       --  current scope. The visible defining entity for the package is the
@@ -149,7 +177,7 @@ package body Sem_Ch7 is
          Write_Eol;
       end if;
 
-      --  Set Body_Id. Note that this will be reset to point to the
+      --  Set Body_Id. Note that this Will be reset to point to the
       --  generic copy later on in the generic case.
 
       Body_Id := Defining_Entity (N);
@@ -204,7 +232,6 @@ package body Sem_Ch7 is
       Style.Check_Identifier (Body_Id, Spec_Id);
 
       if Is_Child_Unit (Spec_Id) then
-
          if Nkind (Parent (N)) /= N_Compilation_Unit then
             Error_Msg_NE
               ("body of child unit& cannot be an inner package", N, Spec_Id);
@@ -375,6 +402,13 @@ package body Sem_Ch7 is
 
       Check_References (Body_Id);
 
+      --  For a generic unit, check that the formal parameters are referenced,
+      --  and that local variables are used, as for regular packages.
+
+      if Ekind (Spec_Id) = E_Generic_Package then
+         Check_References (Spec_Id);
+      end if;
+
       --  The processing so far has made all entities of the package body
       --  public (i.e. externally visible to the linker). This is in general
       --  necessary, since inlined or generic bodies, for which code is
@@ -396,7 +430,6 @@ package body Sem_Ch7 is
         and then Present (Declarations (N))
       then
          Make_Non_Public_Where_Possible : declare
-            Discard : Boolean;
 
             function Has_Referencer
               (L     : List_Id;
@@ -552,7 +585,13 @@ package body Sem_Ch7 is
          --  Start of processing for Make_Non_Public_Where_Possible
 
          begin
-            Discard := Has_Referencer (Declarations (N), Outer => True);
+            declare
+               Discard : Boolean;
+               pragma Warnings (Off, Discard);
+
+            begin
+               Discard := Has_Referencer (Declarations (N), Outer => True);
+            end;
          end Make_Non_Public_Where_Possible;
       end if;
 
@@ -586,6 +625,7 @@ package body Sem_Ch7 is
       Enter_Name (Id);
       Set_Ekind (Id, E_Package);
       Set_Etype (Id, Standard_Void_Type);
+
       New_Scope (Id);
 
       PF := Is_Pure (Enclosing_Lib_Unit_Entity);
@@ -617,34 +657,15 @@ package body Sem_Ch7 is
 
          Validate_RT_RAT_Component (N);
       end if;
-
-      --  Clear Not_Source_Assigned on all variables in the package spec,
-      --  because at this stage some client, or the body, or a child package,
-      --  may modify variables in the declaration. Note that we wait till now
-      --  to reset these flags, because during analysis of the declaration,
-      --  the flags correctly indicated the status up to that point. We
-      --  similarly clear any Is_True_Constant indications.
-
-      declare
-         E : Entity_Id;
-
-      begin
-         E := First_Entity (Id);
-         while Present (E) loop
-            if Ekind (E) = E_Variable then
-               Set_Not_Source_Assigned (E, False);
-               Set_Is_True_Constant    (E, False);
-            end if;
-
-            Next_Entity (E);
-         end loop;
-      end;
    end Analyze_Package_Declaration;
 
    -----------------------------------
    -- Analyze_Package_Specification --
    -----------------------------------
 
+   --  Note that this code is shared for the analysis of generic package
+   --  specs (see Sem_Ch12.Analyze_Generic_Package_Declaration for details).
+
    procedure Analyze_Package_Specification (N : Node_Id) is
       Id           : constant Entity_Id  := Defining_Entity (N);
       Orig_Decl    : constant Node_Id    := Original_Node (Parent (N));
@@ -652,12 +673,110 @@ package body Sem_Ch7 is
       Priv_Decls   : constant List_Id    := Private_Declarations (N);
       E            : Entity_Id;
       L            : Entity_Id;
-      Public_Child : Boolean             := False;
+      Public_Child : Boolean;
+
+      procedure Clear_Constants (Id : Entity_Id; FE : Entity_Id);
+      --  Clears constant indications (Never_Set_In_Source, Constant_Value,
+      --  and Is_True_Constant) on all variables that are entities of Id,
+      --  and on the chain whose first element is FE. A recursive call is
+      --  made for all packages and generic packages.
+
+      procedure Generate_Parent_References;
+      --  For a child unit, generate references to parent units, for
+      --  GPS navigation purposes.
 
       function Is_Public_Child (Child, Unit : Entity_Id) return Boolean;
       --  Child and Unit are entities of compilation units. True if Child
       --  is a public child of Parent as defined in 10.1.1
 
+      ---------------------
+      -- Clear_Constants --
+      ---------------------
+
+      procedure Clear_Constants (Id : Entity_Id; FE : Entity_Id) is
+         E : Entity_Id;
+
+      begin
+         --  Ignore package renamings, not interesting and they can
+         --  cause self referential loops in the code below.
+
+         if Nkind (Parent (Id)) = N_Package_Renaming_Declaration then
+            return;
+         end if;
+
+         --  Note: in the loop below, the check for Next_Entity pointing
+         --  back to the package entity seems very odd, but it is needed,
+         --  because this kind of unexpected circularity does occur ???
+
+         E := FE;
+         while Present (E) and then E /= Id loop
+            if Ekind (E) = E_Variable then
+               Set_Never_Set_In_Source (E, False);
+               Set_Is_True_Constant    (E, False);
+               Set_Current_Value       (E, Empty);
+               Set_Is_Known_Non_Null   (E, False);
+
+            elsif Ekind (E) = E_Package
+                    or else
+                  Ekind (E) = E_Generic_Package
+            then
+               Clear_Constants (E, First_Entity (E));
+               Clear_Constants (E, First_Private_Entity (E));
+            end if;
+
+            Next_Entity (E);
+         end loop;
+      end Clear_Constants;
+
+      --------------------------------
+      -- Generate_Parent_References --
+      --------------------------------
+
+      procedure Generate_Parent_References is
+         Decl : Node_Id := Parent (N);
+
+      begin
+         if Id = Cunit_Entity (Main_Unit)
+           or else Parent (Decl) = Library_Unit (Cunit (Main_Unit))
+         then
+            Generate_Reference (Id, Scope (Id), 'k', False);
+
+         elsif Nkind (Unit (Cunit (Main_Unit))) /= N_Subprogram_Body
+           and then Nkind (Unit (Cunit (Main_Unit))) /= N_Subunit
+         then
+            --  If current unit is an ancestor of main unit, generate
+            --  a reference to its own parent.
+
+            declare
+               U         : Node_Id;
+               Main_Spec : Node_Id := Unit (Cunit (Main_Unit));
+
+            begin
+               if Nkind (Main_Spec) = N_Package_Body then
+                  Main_Spec := Unit (Library_Unit (Cunit (Main_Unit)));
+               end if;
+
+               U := Parent_Spec (Main_Spec);
+               while Present (U) loop
+                  if U = Parent (Decl) then
+                     Generate_Reference (Id, Scope (Id), 'k',  False);
+                     exit;
+
+                  elsif Nkind (Unit (U)) = N_Package_Body then
+                     exit;
+
+                  else
+                     U := Parent_Spec (Unit (U));
+                  end if;
+               end loop;
+            end;
+         end if;
+      end Generate_Parent_References;
+
+      ---------------------
+      -- Is_Public_Child --
+      ---------------------
+
       function Is_Public_Child (Child, Unit : Entity_Id) return Boolean is
       begin
          if not Is_Private_Descendant (Child) then
@@ -682,7 +801,6 @@ package body Sem_Ch7 is
       --  Verify that incomplete types have received full declarations.
 
       E := First_Entity (Id);
-
       while Present (E) loop
          if Ekind (E) = E_Incomplete_Type
            and then No (Full_View (E))
@@ -722,7 +840,11 @@ package body Sem_Ch7 is
       --  If package is a public child unit, then make the private
       --  declarations of the parent visible.
 
+      Public_Child := False;
+
       if Present (Parent_Spec (Parent (N))) then
+         Generate_Parent_References;
+
          declare
             Par       : Entity_Id := Id;
             Pack_Decl : Node_Id;
@@ -746,7 +868,6 @@ package body Sem_Ch7 is
       L := Last_Entity (Id);
 
       if Present (Priv_Decls) then
-         L := Last_Entity (Id);
          Set_In_Private_Part (Id);
 
          --  Upon entering a public child's private part, it may be
@@ -815,6 +936,26 @@ package body Sem_Ch7 is
       end if;
 
       Process_End_Label (N, 'e', Id);
+
+      --  For the case of a library level package, we must go through all
+      --  the entities clearing the indications that the value may be
+      --  constant and not modified. Why? Because any client of this
+      --  package may modify these values freely from anywhere. This
+      --  also applies to any nested packages or generic packages.
+
+      --  For now we unconditionally clear constants for packages that
+      --  are instances of generic packages. The reason is that we do not
+      --  have the body yet, and we otherwise think things are unreferenced
+      --  when they are not. This should be fixed sometime (the effect is
+      --  not terrible, we just lose some warnings, and also some cases
+      --  of value propagation) ???
+
+      if Is_Library_Level_Entity (Id)
+        or else Is_Generic_Instance (Id)
+      then
+         Clear_Constants (Id, First_Entity (Id));
+         Clear_Constants (Id, First_Private_Entity (Id));
+      end if;
    end Analyze_Package_Specification;
 
    --------------------------------------
@@ -822,8 +963,8 @@ package body Sem_Ch7 is
    --------------------------------------
 
    procedure Analyze_Private_Type_Declaration (N : Node_Id) is
-      PF : constant Boolean := Is_Pure (Enclosing_Lib_Unit_Entity);
-      Id : Entity_Id := Defining_Identifier (N);
+      PF : constant Boolean   := Is_Pure (Enclosing_Lib_Unit_Entity);
+      Id : constant Entity_Id := Defining_Identifier (N);
 
    begin
       Generate_Definition (Id);
@@ -839,8 +980,6 @@ package body Sem_Ch7 is
 
       New_Private_Type (N, Id, N);
       Set_Depends_On_Private (Id);
-      Set_Has_Delayed_Freeze (Id);
-
    end Analyze_Private_Type_Declaration;
 
    -------------------------------------------
@@ -848,20 +987,58 @@ package body Sem_Ch7 is
    -------------------------------------------
 
    procedure Declare_Inherited_Private_Subprograms (Id : Entity_Id) is
-      E : Entity_Id;
+      E              : Entity_Id;
       Op_List        : Elist_Id;
       Op_Elmt        : Elmt_Id;
       Op_Elmt_2      : Elmt_Id;
       Prim_Op        : Entity_Id;
-      New_Op         : Entity_Id;
+      New_Op         : Entity_Id := Empty;
       Parent_Subp    : Entity_Id;
       Found_Explicit : Boolean;
       Decl_Privates  : Boolean;
 
+      function Has_Overriding_Pragma (Subp : Entity_Id) return Boolean;
+      --  Check whether a pragma Overriding has been provided for a primitive
+      --  operation that is found to be overriding in the private part.
+
       function Is_Primitive_Of (T : Entity_Id; S : Entity_Id) return Boolean;
       --  Check whether an inherited subprogram is an operation of an
       --  untagged derived type.
 
+      ---------------------------
+      -- Has_Overriding_Pragma --
+      ---------------------------
+
+      function Has_Overriding_Pragma (Subp : Entity_Id) return Boolean is
+         Decl : constant Node_Id := Unit_Declaration_Node (Subp);
+         Prag : Node_Id;
+
+      begin
+         if No (Decl)
+           or else Nkind (Decl) /= N_Subprogram_Declaration
+           or else No (Next (Decl))
+         then
+            return False;
+
+         else
+            Prag := Next (Decl);
+
+            while Present (Prag)
+              and then Nkind (Prag) = N_Pragma
+            loop
+               if Chars (Prag) = Name_Overriding
+                 or else Chars (Prag) = Name_Optional_Overriding
+               then
+                  return True;
+               else
+                  Next (Prag);
+               end if;
+            end loop;
+         end if;
+
+         return False;
+      end Has_Overriding_Pragma;
+
       ---------------------
       -- Is_Primitive_Of --
       ---------------------
@@ -892,7 +1069,6 @@ package body Sem_Ch7 is
 
    begin
       E := First_Entity (Id);
-
       while Present (E) loop
 
          --  If the entity is a nonprivate type extension whose parent
@@ -902,17 +1078,17 @@ package body Sem_Ch7 is
 
          if ((Is_Derived_Type (E) and then not Is_Private_Type (E))
                or else
-             (Nkind (Parent (E)) = N_Private_Extension_Declaration
-               and then Is_Generic_Type (E)))
+                 (Nkind (Parent (E)) = N_Private_Extension_Declaration
+                   and then Is_Generic_Type (E)))
            and then In_Open_Scopes (Scope (Etype (E)))
            and then E = Base_Type (E)
          then
             if Is_Tagged_Type (E) then
                Op_List       := Primitive_Operations (E);
-               Op_Elmt       := First_Elmt (Op_List);
                New_Op        := Empty;
                Decl_Privates := False;
 
+               Op_Elmt := First_Elmt (Op_List);
                while Present (Op_Elmt) loop
                   Prim_Op := Node (Op_Elmt);
 
@@ -946,6 +1122,19 @@ package body Sem_Ch7 is
                            Remove_Elmt (Op_List, Op_Elmt_2);
                            Found_Explicit := True;
                            Decl_Privates  := True;
+
+                           --  If explicit_overriding is in effect, check that
+                           --  the overriding operation is properly labelled.
+
+                           if Explicit_Overriding
+                             and then Comes_From_Source (New_Op)
+                              and then not Has_Overriding_Pragma (New_Op)
+                           then
+                              Error_Msg_NE
+                                ("Missing overriding pragma for&",
+                                  New_Op, New_Op);
+                           end if;
+
                            exit;
                         end if;
 
@@ -1067,31 +1256,6 @@ package body Sem_Ch7 is
       Set_Homonym     (Full_Id, H2);
    end Exchange_Declarations;
 
-   ----------------------------------
-   -- Install_Composite_Operations --
-   ----------------------------------
-
-   procedure Install_Composite_Operations (P : Entity_Id) is
-      Id : Entity_Id;
-
-   begin
-      Id := First_Entity (P);
-
-      while Present (Id) loop
-
-         if Is_Type (Id)
-           and then (Is_Limited_Composite (Id)
-                      or else Is_Private_Composite (Id))
-           and then No (Private_Component (Id))
-         then
-            Set_Is_Limited_Composite (Id, False);
-            Set_Is_Private_Composite (Id, False);
-         end if;
-
-         Next_Entity (Id);
-      end loop;
-   end Install_Composite_Operations;
-
    ----------------------------
    -- Install_Package_Entity --
    ----------------------------
@@ -1132,7 +1296,6 @@ package body Sem_Ch7 is
       --  one so we also skip the exchange.
 
       Id := First_Entity (P);
-
       while Present (Id) and then Id /= First_Private_Entity (P) loop
 
          if Is_Private_Base_Type (Id)
@@ -1141,8 +1304,6 @@ package body Sem_Ch7 is
            and then Scope (Full_View (Id)) = Scope (Id)
            and then Ekind (Full_View (Id)) /= E_Incomplete_Type
          then
-            Priv_Elmt := First_Elmt (Private_Dependents (Id));
-
             --  If there is a use-type clause on the private type, set the
             --  full view accordingly.
 
@@ -1172,6 +1333,8 @@ package body Sem_Ch7 is
                end if;
             end if;
 
+            Priv_Elmt := First_Elmt (Private_Dependents (Id));
+
             Exchange_Declarations (Id);
             Set_Is_Immediately_Visible (Id);
 
@@ -1200,8 +1363,6 @@ package body Sem_Ch7 is
 
                Next_Elmt (Priv_Elmt);
             end loop;
-
-            null;
          end if;
 
          Next_Entity (Id);
@@ -1238,29 +1399,6 @@ package body Sem_Ch7 is
       end loop;
    end Install_Visible_Declarations;
 
-   ----------------------
-   -- Is_Fully_Visible --
-   ----------------------
-
-   --  The full declaration of a private type is visible in the private
-   --  part of the package declaration, and in the package body, at which
-   --  point the full declaration must have been given.
-
-   function Is_Fully_Visible (Type_Id : Entity_Id) return Boolean is
-      S : constant Entity_Id := Scope (Type_Id);
-
-   begin
-      if Is_Generic_Type (Type_Id) then
-         return False;
-
-      elsif In_Private_Part (S) then
-         return Present (Full_View (Type_Id));
-
-      else
-         return In_Package_Body (S);
-      end if;
-   end Is_Fully_Visible;
-
    --------------------------
    -- Is_Private_Base_Type --
    --------------------------
@@ -1294,7 +1432,13 @@ package body Sem_Ch7 is
       elsif not (Is_Derived_Type (Dep))
         and then Is_Derived_Type (Full_View (Dep))
       then
-         return In_Open_Scopes (S);
+         --  When instantiating a package body, the scope stack is empty,
+         --  so check instead whether the dependent type is defined in
+         --  the same scope as the instance itself.
+
+         return In_Open_Scopes (S)
+           or else (Is_Generic_Instance (Current_Scope)
+              and then Scope (Dep) = Scope (Current_Scope));
       else
          return True;
       end if;
@@ -1365,7 +1509,7 @@ package body Sem_Ch7 is
       Set_Is_Tagged_Type (Id, Tagged_Present (Def));
 
       Set_Discriminant_Constraint (Id, No_Elist);
-      Set_Girder_Constraint (Id, No_Elist);
+      Set_Stored_Constraint (Id, No_Elist);
 
       if Present (Discriminant_Specifications (N)) then
          New_Scope (Id);
@@ -1391,57 +1535,71 @@ package body Sem_Ch7 is
       end if;
    end New_Private_Type;
 
-   ------------------------------
-   -- Preserve_Full_Attributes --
-   ------------------------------
+   ----------------------------
+   -- Uninstall_Declarations --
+   ----------------------------
+
+   procedure Uninstall_Declarations (P : Entity_Id) is
+      Decl      : constant Node_Id := Unit_Declaration_Node (P);
+      Id        : Entity_Id;
+      Full      : Entity_Id;
+      Priv_Elmt : Elmt_Id;
+      Priv_Sub  : Entity_Id;
 
-   procedure Preserve_Full_Attributes (Priv, Full : Entity_Id) is
-      Priv_Is_Base_Type : constant Boolean := Priv = Base_Type (Priv);
+      procedure Preserve_Full_Attributes (Priv, Full : Entity_Id);
+      --  Copy to the private declaration the attributes of the full view
+      --  that need to be available for the partial view also.
 
-   begin
-      Set_Size_Info                   (Priv,                          (Full));
-      Set_RM_Size                     (Priv, RM_Size                  (Full));
-      Set_Size_Known_At_Compile_Time  (Priv, Size_Known_At_Compile_Time
-                                                                      (Full));
+      function Type_In_Use (T : Entity_Id) return Boolean;
+      --  Check whether type or base type appear in an active use_type clause.
 
-      if Priv_Is_Base_Type then
-         Set_Is_Controlled            (Priv, Is_Controlled (Base_Type (Full)));
-         Set_Finalize_Storage_Only    (Priv, Finalize_Storage_Only
-                                                           (Base_Type (Full)));
-         Set_Has_Task                 (Priv, Has_Task      (Base_Type (Full)));
-         Set_Has_Controlled_Component (Priv, Has_Controlled_Component
-                                                           (Base_Type (Full)));
-      end if;
+      ------------------------------
+      -- Preserve_Full_Attributes --
+      ------------------------------
 
-      Set_Freeze_Node                 (Priv, Freeze_Node              (Full));
+      procedure Preserve_Full_Attributes (Priv, Full : Entity_Id) is
+         Priv_Is_Base_Type : constant Boolean := Priv = Base_Type (Priv);
+
+      begin
+         Set_Size_Info (Priv, (Full));
+         Set_RM_Size (Priv, RM_Size (Full));
+         Set_Size_Known_At_Compile_Time (Priv, Size_Known_At_Compile_Time
+                                                                      (Full));
+         Set_Is_Volatile       (Priv, Is_Volatile       (Full));
+         Set_Treat_As_Volatile (Priv, Treat_As_Volatile (Full));
+
+         if Referenced (Full) then
+            Set_Referenced (Priv);
+         end if;
 
-      if Is_Tagged_Type (Priv)
-        and then Is_Tagged_Type (Full)
-        and then not Error_Posted (Full)
-      then
          if Priv_Is_Base_Type then
-            Set_Access_Disp_Table     (Priv, Access_Disp_Table
+            Set_Is_Controlled (Priv, Is_Controlled (Base_Type (Full)));
+            Set_Finalize_Storage_Only (Priv, Finalize_Storage_Only
+                                                           (Base_Type (Full)));
+            Set_Has_Task (Priv, Has_Task (Base_Type (Full)));
+            Set_Has_Controlled_Component (Priv, Has_Controlled_Component
                                                            (Base_Type (Full)));
          end if;
 
-         Set_First_Entity             (Priv, First_Entity             (Full));
-         Set_Last_Entity              (Priv, Last_Entity              (Full));
-      end if;
-   end Preserve_Full_Attributes;
+         Set_Freeze_Node (Priv, Freeze_Node (Full));
 
-   ----------------------------
-   -- Uninstall_Declarations --
-   ----------------------------
+         if Is_Tagged_Type (Priv)
+           and then Is_Tagged_Type (Full)
+           and then not Error_Posted (Full)
+         then
+            if Priv_Is_Base_Type then
+               Set_Access_Disp_Table (Priv, Access_Disp_Table
+                                                           (Base_Type (Full)));
+            end if;
 
-   procedure Uninstall_Declarations (P : Entity_Id) is
-      Id   : Entity_Id;
-      Decl : Node_Id := Unit_Declaration_Node (P);
-      Full : Entity_Id;
-      Priv_Elmt : Elmt_Id;
-      Priv_Sub  : Entity_Id;
+            Set_First_Entity (Priv, First_Entity (Full));
+            Set_Last_Entity (Priv, Last_Entity (Full));
+         end if;
+      end Preserve_Full_Attributes;
 
-      function Type_In_Use (T : Entity_Id) return Boolean;
-      --  Check whether type or base type appear in an active use_type clause.
+      -----------------
+      -- Type_In_Use --
+      -----------------
 
       function Type_In_Use (T : Entity_Id) return Boolean is
       begin
@@ -1475,6 +1633,7 @@ package body Sem_Ch7 is
          if Ekind (Id) = E_Function
            and then  Is_Operator_Symbol_Name (Chars (Id))
            and then not Is_Hidden (Id)
+           and then not Error_Posted (Id)
          then
             Set_Is_Potentially_Use_Visible (Id,
               In_Use (P)
@@ -1523,7 +1682,32 @@ package body Sem_Ch7 is
            and then (Nkind (Parent (Id)) /= N_Object_Declaration
                       or else not No_Initialization (Parent (Id)))
          then
-            Error_Msg_N ("missing full declaration for deferred constant", Id);
+            if not Has_Private_Declaration (Etype (Id)) then
+
+               --  We assume that the user did not not intend a deferred
+               --  constant declaration, and the expression is just missing.
+
+               Error_Msg_N
+                 ("constant declaration requires initialization expression",
+                   Parent (Id));
+
+               if Is_Limited_Type (Etype (Id)) then
+                  Error_Msg_N
+                    ("\else remove keyword CONSTANT from declaration",
+                    Parent (Id));
+               end if;
+
+            else
+               Error_Msg_N
+                  ("missing full declaration for deferred constant ('R'M 7.4)",
+                     Id);
+
+               if Is_Limited_Type (Etype (Id)) then
+                  Error_Msg_N
+                    ("\else remove keyword CONSTANT from declaration",
+                    Parent (Id));
+               end if;
+            end if;
          end if;
 
          Next_Entity (Id);
@@ -1562,7 +1746,7 @@ package body Sem_Ch7 is
 
             --  If the partial view is not declared in the visible part
             --  of the package (as is the case when it is a type derived
-            --  from some other private type in the private part if the
+            --  from some other private type in the private part of the
             --  current package), no exchange takes place.
 
             if No (Parent (Id))
@@ -1641,7 +1825,6 @@ package body Sem_Ch7 is
          <<Next_Id>>
             Next_Entity (Id);
       end loop;
-
    end Uninstall_Declarations;
 
    ------------------------
@@ -1666,12 +1849,7 @@ package body Sem_Ch7 is
 
       --  Body required if subprogram
 
-      elsif (Is_Subprogram (P)
-               or else
-             Ekind (P) = E_Generic_Function
-               or else
-             Ekind (P) = E_Generic_Procedure)
-      then
+      elsif Is_Subprogram (P) or else Is_Generic_Subprogram (P) then
          return True;
 
       --  Treat a block as requiring a body
@@ -1684,7 +1862,7 @@ package body Sem_Ch7 is
         and then Present (Generic_Parent (Parent (P)))
       then
          declare
-            G_P : Entity_Id := Generic_Parent (Parent (P));
+            G_P : constant Entity_Id := Generic_Parent (Parent (P));
 
          begin
             if Has_Pragma_Elaborate_Body (G_P) then
@@ -1733,11 +1911,7 @@ package body Sem_Ch7 is
                and then Unit_Requires_Body (E))
 
            or else
-             (Ekind (E) = E_Generic_Function
-               and then not Has_Completion (E))
-
-           or else
-             (Ekind (E) = E_Generic_Procedure
+             (Is_Generic_Subprogram (E)
                and then not Has_Completion (E))
 
          then