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.


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

1 files changed, 104 insertions, 121 deletions

diff --git a/gcc/ada/exp_strm.adb b/gcc/ada/exp_strm.adb
index 6cc2e7f23ec..726f713fe3c 100644
--- a/gcc/ada/exp_strm.adb
+++ b/gcc/ada/exp_strm.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- --
@@ -24,20 +24,19 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Atree;    use Atree;
-with Einfo;    use Einfo;
-with Lib;      use Lib;
-with Namet;    use Namet;
-with Nlists;   use Nlists;
-with Nmake;    use Nmake;
-with Rtsfind;  use Rtsfind;
-with Sinfo;    use Sinfo;
-with Snames;   use Snames;
-with Stand;    use Stand;
-with Tbuild;   use Tbuild;
-with Ttypes;   use Ttypes;
-with Exp_Tss;  use Exp_Tss;
-with Uintp;    use Uintp;
+with Atree;   use Atree;
+with Einfo;   use Einfo;
+with Namet;   use Namet;
+with Nlists;  use Nlists;
+with Nmake;   use Nmake;
+with Rtsfind; use Rtsfind;
+with Sinfo;   use Sinfo;
+with Snames;  use Snames;
+with Stand;   use Stand;
+with Tbuild;  use Tbuild;
+with Ttypes;  use Ttypes;
+with Exp_Tss; use Exp_Tss;
+with Uintp;   use Uintp;
 
 package body Exp_Strm is
 
@@ -80,18 +79,6 @@ package body Exp_Strm is
    --  Decls and Stms are the declarations and statements for the body and
    --  The parameter Fnam is the name of the constructed function.
 
-   procedure Build_Stream_Procedure
-     (Loc  : Source_Ptr;
-      Typ  : Entity_Id;
-      Decl : out Node_Id;
-      Pnam : Entity_Id;
-      Stms : List_Id;
-      Outp : Boolean);
-   --  Called to build an array or record stream procedure. The first three
-   --  arguments are the same as Build_Record_Or_Elementary_Output_Procedure.
-   --  Stms is the list of statements for the body (the declaration list is
-   --  always null), and Pnam is the name of the constructed procedure.
-
    function Has_Stream_Standard_Rep (U_Type : Entity_Id) return Boolean;
    --  This function is used to test U_Type, which is a type
    --  Returns True if U_Type has a standard representation for stream
@@ -99,6 +86,17 @@ package body Exp_Strm is
    --  clause, and the size of the first subtype is the same as the size
    --  of the root type.
 
+   function Make_Stream_Subprogram_Name
+     (Loc : Source_Ptr;
+      Typ : Entity_Id;
+      Nam : TSS_Name_Type) return Entity_Id;
+   --  Return the entity that identifies the stream subprogram for type Typ
+   --  that is identified by the given Nam. This procedure deals with the
+   --  difference between tagged types (where a single subprogram associated
+   --  with the type is generated) and all other cases (where a subprogram
+   --  is generated at the point of the stream attribute reference). The
+   --  Loc parameter is used as the Sloc of the created entity.
+
    function Stream_Base_Type (E : Entity_Id) return Entity_Id;
    --  Stream attributes work on the basis of the base type except for the
    --  array case. For the array case, we do not go to the base type, but
@@ -114,7 +112,7 @@ package body Exp_Strm is
 
    --  The function we build looks like
 
-   --    function InputN (S : access RST) return Typ is
+   --    function typSI[_nnn] (S : access RST) return Typ is
    --      L1 : constant Index_Type_1 := Index_Type_1'Input (S);
    --      H1 : constant Index_Type_1 := Index_Type_1'Input (S);
    --      L2 : constant Index_Type_2 := Index_Type_2'Input (S);
@@ -128,7 +126,11 @@ package body Exp_Strm is
    --    begin
    --      Typ'Read (S, V);
    --      return V;
-   --    end InputN
+   --    end typSI[_nnn]
+
+   --  Note: the suffix [_nnn] is present for non-tagged types, where we
+   --  generate a local subprogram at the point of the occurrence of the
+   --  attribute reference, so the name must be unique.
 
    procedure Build_Array_Input_Function
      (Loc  : Source_Ptr;
@@ -221,8 +223,7 @@ package body Exp_Strm is
 
       Fnam :=
         Make_Defining_Identifier (Loc,
-          Chars =>
-            New_External_Name (Name_uInput, ' ', Increment_Serial_Number));
+          Chars => Make_TSS_Name_Local (Typ, TSS_Stream_Input));
 
       Build_Stream_Function (Loc, Typ, Decl, Fnam, Decls, Stms);
    end Build_Array_Input_Function;
@@ -288,8 +289,7 @@ package body Exp_Strm is
 
       Pnam :=
         Make_Defining_Identifier (Loc,
-          Chars =>
-            New_External_Name (Name_uOutput, ' ', Increment_Serial_Number));
+          Chars => Make_TSS_Name_Local (Typ, TSS_Stream_Output));
 
       Build_Stream_Procedure (Loc, Typ, Decl, Pnam, Stms, False);
    end Build_Array_Output_Procedure;
@@ -309,9 +309,7 @@ package body Exp_Strm is
    begin
       Pnam :=
         Make_Defining_Identifier (Loc,
-          New_External_Name
-            (Name_uRead, ' ', Increment_Serial_Number));
-
+          Chars => Make_TSS_Name_Local (Typ, TSS_Stream_Read));
       Build_Array_Read_Write_Procedure (Nod, Typ, Decl, Pnam, Name_Read);
    end Build_Array_Read_Procedure;
 
@@ -343,8 +341,7 @@ package body Exp_Strm is
       Pnam : Entity_Id;
       Nam  : Name_Id)
    is
-      Loc : constant Source_Ptr := Sloc (Nod);
-
+      Loc  : constant Source_Ptr := Sloc (Nod);
       Ndim : constant Pos        := Number_Dimensions (Typ);
       Ctyp : constant Entity_Id  := Component_Type (Typ);
 
@@ -378,9 +375,9 @@ package body Exp_Strm is
       --  generate any additional freezing actions in any case. See 5509-003.
 
       if Nam = Name_Read then
-         RW := TSS (Base_Type (Ctyp), Name_uRead);
+         RW := TSS (Base_Type (Ctyp), TSS_Stream_Read);
       else
-         RW := TSS (Base_Type (Ctyp), Name_uWrite);
+         RW := TSS (Base_Type (Ctyp), TSS_Stream_Write);
       end if;
 
       if Present (RW)
@@ -435,9 +432,7 @@ package body Exp_Strm is
    begin
       Pnam :=
         Make_Defining_Identifier (Loc,
-          Chars =>
-            New_External_Name (Name_uWrite, ' ', Increment_Serial_Number));
-
+          Chars => Make_TSS_Name_Local (Typ, TSS_Stream_Write));
       Build_Array_Read_Write_Procedure (Nod, Typ, Decl, Pnam, Name_Write);
    end Build_Array_Write_Procedure;
 
@@ -452,7 +447,9 @@ package body Exp_Strm is
       Rt_Type : constant Entity_Id  := Root_Type (U_Type);
       FST     : constant Entity_Id  := First_Subtype (U_Type);
       P_Size  : constant Uint       := Esize (FST);
+      Res     : Node_Id;
       Strm    : constant Node_Id    := First (Expressions (N));
+      Targ    : constant Node_Id    := Next (Strm);
       Lib_RE  : RE_Id;
 
    begin
@@ -580,15 +577,32 @@ package body Exp_Strm is
       end if;
 
       --  Call the function, and do an unchecked conversion of the result
-      --  to the actual type of the prefix.
+      --  to the actual type of the prefix. If the target is a discriminant,
+      --  set target type to force a constraint check (13.13.2 (35)).
 
-      return
-        Unchecked_Convert_To (P_Type,
-          Make_Function_Call (Loc,
-            Name => New_Occurrence_Of (RTE (Lib_RE), Loc),
-            Parameter_Associations => New_List (
-              Relocate_Node (Strm))));
+      if Nkind (Targ) = N_Selected_Component
+        and then Present (Entity (Selector_Name (Targ)))
+        and then Ekind (Entity (Selector_Name (Targ)))
+          = E_Discriminant
+      then
+         Res :=
+           Unchecked_Convert_To (Base_Type (P_Type),
+             Make_Function_Call (Loc,
+               Name => New_Occurrence_Of (RTE (Lib_RE), Loc),
+               Parameter_Associations => New_List (
+                 Relocate_Node (Strm))));
+
+         Set_Do_Range_Check (Res);
+         return Res;
 
+      else
+         return
+           Unchecked_Convert_To (P_Type,
+             Make_Function_Call (Loc,
+               Name => New_Occurrence_Of (RTE (Lib_RE), Loc),
+               Parameter_Associations => New_List (
+                 Relocate_Node (Strm))));
+      end if;
    end Build_Elementary_Input_Call;
 
    ---------------------------------
@@ -746,7 +760,6 @@ package body Exp_Strm is
             Relocate_Node (Strm),
             Unchecked_Convert_To (Etype (Next_Formal (First_Formal (Libent))),
               Relocate_Node (Item))));
-
    end Build_Elementary_Write_Call;
 
    -----------------------------------------
@@ -793,9 +806,7 @@ package body Exp_Strm is
 
       Pnam :=
         Make_Defining_Identifier (Loc,
-          Chars =>
-            New_External_Name (Name_uRead, ' ', Increment_Serial_Number));
-
+          Chars => Make_TSS_Name_Local (Typ, TSS_Stream_Read));
       Build_Record_Read_Write_Procedure (Loc, Typ, Decl, Pnam, Name_Read);
 
       --  Read the discriminants before the rest of the components, so
@@ -860,9 +871,7 @@ package body Exp_Strm is
 
       Pnam :=
         Make_Defining_Identifier (Loc,
-          Chars =>
-            New_External_Name (Name_uWrite, ' ', Increment_Serial_Number));
-
+          Chars => Make_TSS_Name_Local (Typ, TSS_Stream_Write));
       Build_Record_Read_Write_Procedure (Loc, Typ, Decl, Pnam, Name_Write);
 
       --  Write the discriminants before the rest of the components, so
@@ -987,18 +996,7 @@ package body Exp_Strm is
          Make_Return_Statement (Loc,
            Expression => Make_Identifier (Loc, Name_V)));
 
-      --  For tagged types, we use a canonical name so that it matches the
-      --  primitive spec. For all other cases, we use a serialized name so
-      --  that multiple generations of the same procedure do not clash.
-
-      if Is_Tagged_Type (Typ) then
-         Fnam := Make_Defining_Identifier (Loc, Name_uInput);
-      else
-         Fnam :=
-           Make_Defining_Identifier (Loc,
-             Chars =>
-               New_External_Name (Name_uInput, ' ', Increment_Serial_Number));
-      end if;
+      Fnam := Make_Stream_Subprogram_Name (Loc, Typ, TSS_Stream_Input);
 
       Build_Stream_Function (Loc, Typ, Decl, Fnam, Decls, Stms);
    end Build_Record_Or_Elementary_Input_Function;
@@ -1049,19 +1047,7 @@ package body Exp_Strm is
             Make_Identifier (Loc, Name_S),
             Make_Identifier (Loc, Name_V))));
 
-      --  For tagged types, we use a canonical name so that it matches the
-      --  primitive spec. For all other cases, we use a serialized name so
-      --  that multiple generations of the same procedure do not clash.
-
-      if Is_Tagged_Type (Typ) then
-         Pnam := Make_Defining_Identifier (Loc, Name_uOutput);
-      else
-         Pnam :=
-           Make_Defining_Identifier (Loc,
-             Chars =>
-               New_External_Name
-                 (Name_uOutput, ' ', Increment_Serial_Number));
-      end if;
+      Pnam := Make_Stream_Subprogram_Name (Loc, Typ, TSS_Stream_Output);
 
       Build_Stream_Procedure (Loc, Typ, Decl, Pnam, Stms, False);
    end Build_Record_Or_Elementary_Output_Procedure;
@@ -1077,19 +1063,7 @@ package body Exp_Strm is
       Pnam : out Entity_Id)
    is
    begin
-      --  For tagged types, we use a canonical name so that it matches the
-      --  primitive spec. For all other cases, we use a serialized name so
-      --  that multiple generations of the same procedure do not clash.
-
-      if Is_Tagged_Type (Typ) then
-         Pnam := Make_Defining_Identifier (Loc, Name_uRead);
-      else
-         Pnam :=
-           Make_Defining_Identifier (Loc,
-             Chars =>
-               New_External_Name (Name_uRead, ' ', Increment_Serial_Number));
-      end if;
-
+      Pnam := Make_Stream_Subprogram_Name (Loc, Typ, TSS_Stream_Read);
       Build_Record_Read_Write_Procedure (Loc, Typ, Decl, Pnam, Name_Read);
    end Build_Record_Read_Procedure;
 
@@ -1283,7 +1257,8 @@ package body Exp_Strm is
       --  Write do not read or write the discriminant values. All handling
       --  of discriminants occurs in the Input and Output subprograms.
 
-      Rdef := Type_Definition (Declaration_Node (Underlying_Type (Typt)));
+      Rdef := Type_Definition
+                (Declaration_Node (Base_Type (Underlying_Type (Typt))));
       Stms := Empty_List;
 
       --  In record extension case, the fields we want, including the _Parent
@@ -1302,7 +1277,6 @@ package body Exp_Strm is
 
       Build_Stream_Procedure
         (Loc, Typ, Decl, Pnam, Stms, Nam = Name_Read);
-
    end Build_Record_Read_Write_Procedure;
 
    ----------------------------------
@@ -1316,19 +1290,7 @@ package body Exp_Strm is
       Pnam : out Entity_Id)
    is
    begin
-      --  For tagged types, we use a canonical name so that it matches the
-      --  primitive spec. For all other cases, we use a serialized name so
-      --  that multiple generations of the same procedure do not clash.
-
-      if Is_Tagged_Type (Typ) then
-         Pnam := Make_Defining_Identifier (Loc, Name_uWrite);
-      else
-         Pnam :=
-           Make_Defining_Identifier (Loc,
-             Chars =>
-               New_External_Name (Name_uWrite, ' ', Increment_Serial_Number));
-      end if;
-
+      Pnam := Make_Stream_Subprogram_Name (Loc, Typ, TSS_Stream_Write);
       Build_Record_Read_Write_Procedure (Loc, Typ, Decl, Pnam, Name_Write);
    end Build_Record_Write_Procedure;
 
@@ -1337,27 +1299,26 @@ package body Exp_Strm is
    -------------------------------
 
    function Build_Stream_Attr_Profile
-     (Loc  : Source_Ptr;
-      Typ  : Entity_Id;
-      Nam  : Name_Id)
-      return List_Id
+     (Loc : Source_Ptr;
+      Typ : Entity_Id;
+      Nam : TSS_Name_Type) return List_Id
    is
       Profile : List_Id;
 
    begin
       Profile := New_List (
         Make_Parameter_Specification (Loc,
-          Defining_Identifier =>  Make_Defining_Identifier (Loc, Name_S),
+          Defining_Identifier => Make_Defining_Identifier (Loc, Name_S),
           Parameter_Type      =>
           Make_Access_Definition (Loc,
              Subtype_Mark => New_Reference_To (
                Class_Wide_Type (RTE (RE_Root_Stream_Type)), Loc))));
 
-      if Nam /= Name_uInput then
+      if Nam /= TSS_Stream_Input then
          Append_To (Profile,
            Make_Parameter_Specification (Loc,
              Defining_Identifier => Make_Defining_Identifier (Loc, Name_V),
-             Out_Present         => (Nam = Name_uRead),
+             Out_Present         => (Nam = TSS_Stream_Read),
              Parameter_Type      => New_Reference_To (Typ, Loc)));
       end if;
 
@@ -1402,7 +1363,6 @@ package body Exp_Strm is
           Handled_Statement_Sequence =>
             Make_Handled_Sequence_Of_Statements (Loc,
               Statements => Stms));
-
    end Build_Stream_Function;
 
    ----------------------------
@@ -1446,7 +1406,6 @@ package body Exp_Strm is
           Handled_Statement_Sequence =>
             Make_Handled_Sequence_Of_Statements (Loc,
               Statements => Stms));
-
    end Build_Stream_Procedure;
 
    -----------------------------
@@ -1457,13 +1416,38 @@ package body Exp_Strm is
    begin
       if Has_Non_Standard_Rep (U_Type) then
          return False;
-
       else
          return
            Esize (First_Subtype (U_Type)) = Esize (Root_Type (U_Type));
       end if;
    end Has_Stream_Standard_Rep;
 
+   ---------------------------------
+   -- Make_Stream_Subprogram_Name --
+   ---------------------------------
+
+   function Make_Stream_Subprogram_Name
+     (Loc : Source_Ptr;
+      Typ : Entity_Id;
+      Nam : TSS_Name_Type) return Entity_Id
+   is
+      Sname : Name_Id;
+
+   begin
+      --  For tagged types, we are dealing with a TSS associated with the
+      --  declaration, so we use the standard primitive function name. For
+      --  other types, generate a local TSS name since we are generating
+      --  the subprogram at the point of use.
+
+      if Is_Tagged_Type (Typ) then
+         Sname := Make_TSS_Name (Typ, Nam);
+      else
+         Sname := Make_TSS_Name_Local (Typ, Nam);
+      end if;
+
+      return Make_Defining_Identifier (Loc, Sname);
+   end Make_Stream_Subprogram_Name;
+
    ----------------------
    -- Stream_Base_Type --
    ----------------------
@@ -1474,7 +1458,6 @@ package body Exp_Strm is
         and then Is_First_Subtype (E)
       then
          return E;
-
       else
          return Base_Type (E);
       end if;