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, 134 insertions, 124 deletions

diff --git a/gcc/ada/xr_tabls.ads b/gcc/ada/xr_tabls.ads
index f15ebd7e7f8..794dcb9498a 100644
--- a/gcc/ada/xr_tabls.ads
+++ b/gcc/ada/xr_tabls.ads
@@ -19,11 +19,12 @@
 -- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
 -- MA 02111-1307, USA.                                                      --
 --                                                                          --
--- Extensive contributions were provided by Ada Core Technologies Inc.   --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Strings.Unbounded;
+with GNAT.OS_Lib;
 
 package Xr_Tabls is
 
@@ -32,46 +33,20 @@ package Xr_Tabls is
    -------------------
 
    function ALI_File_Name (Ada_File_Name : String) return String;
-   --  Returns the ali file name corresponding to Ada_File_Name, using the
-   --  information provided in gnat.adc if it exists
-
-   procedure Create_Project_File
-     (Name           : String);
-   --  Open and parse a new project file
-   --  If the file Name could not be open or is not a valid project file
-   --  then a project file associated with the standard default directories
-   --  is returned
-
-   function Find_ALI_File (Short_Name  : String) return String;
-   --  Returns the directory name for the file Short_Name
-   --  takes into account the obj_dir lines in the project file,
-   --  and the default paths for Gnat
-
-   function Find_Source_File (Short_Name  : String) return String;
-   --  Returns the directory name for the file Short_Name
-   --  takes into account the src_dir lines in the project file,
-   --  and the default paths for Gnat
-
-   function Next_Src_Dir return String;
-   --  Returns the next directory to visit to find related source files
-   --  If there are no more such directory, Length = 0
+   --  Returns the ali file name corresponding to Ada_File_Name.
+
+   procedure Create_Project_File (Name : String);
+   --  Open and parse a new project file. If the file Name could not be
+   --  opened or is not a valid project file, then a project file associated
+   --  with the standard default directories is returned
 
    function Next_Obj_Dir return String;
    --  Returns the next directory to visit to find related ali files
-   --  If there are no more such directory, Length = 0
+   --  If there are no more such directories, returns a null string.
 
    function Current_Obj_Dir return String;
    --  Returns the obj_dir which was returned by the last Next_Obj_Dir call
 
-   procedure Parse_Gnatls
-     (Gnatls_Src_Cache : out Ada.Strings.Unbounded.Unbounded_String;
-      Gnatls_Obj_Cache : out Ada.Strings.Unbounded.Unbounded_String);
-   --  Parse the output of Gnatls, to find the standard
-   --  directories for source files
-
-   procedure Reset_Src_Dir;
-   --  Reset the iterator for Src_Dir
-
    procedure Reset_Obj_Dir;
    --  Reset the iterator for Obj_Dir
 
@@ -82,24 +57,37 @@ package Xr_Tabls is
    type Declaration_Reference is private;
    Empty_Declaration : constant Declaration_Reference;
 
+   type Declaration_Array is array (Natural range <>) of Declaration_Reference;
+   type Declaration_Array_Access is access Declaration_Array;
+
    type File_Reference is private;
    Empty_File : constant File_Reference;
 
    type Reference is private;
    Empty_Reference : constant Reference;
 
-   type File_Table is limited private;
-   type Entity_Table is limited private;
+   type Reference_Array is array (Natural range <>) of Reference;
+   type Reference_Array_Access is access Reference_Array;
+
+   procedure Free (Arr : in out Reference_Array_Access);
 
    function Add_Declaration
-     (File_Ref  : File_Reference;
-      Symbol    : String;
-      Line      : Natural;
-      Column    : Natural;
-      Decl_Type : Character)
-      return      Declaration_Reference;
+     (File_Ref     : File_Reference;
+      Symbol       : String;
+      Line         : Natural;
+      Column       : Natural;
+      Decl_Type    : Character;
+      Remove_Only  : Boolean := False;
+      Symbol_Match : Boolean := True)
+      return         Declaration_Reference;
    --  Add a new declaration in the table and return the index to it.
-   --  Decl_Type is the type of the entity
+   --  Decl_Type is the type of the entity Any previous instance of this
+   --  entity in the htable is removed. If Remove_Only is True, then any
+   --  previous instance is removed, but the new entity is never inserted.
+   --  Symbol_Match should be set to False if the name of the symbol doesn't
+   --  match the pattern from the command line. In that case, the entity will
+   --  not be output by gnatfind. If Symbol_Match is True, the entity will only
+   --  be output if the file name itself matches.
 
    procedure Add_Parent
      (Declaration : in out Declaration_Reference;
@@ -110,17 +98,15 @@ package Xr_Tabls is
    --  The parent declaration (Symbol in file File_Ref at position Line and
    --  Column) information is added to Declaration.
 
-   procedure Add_To_Xref_File
+   function Add_To_Xref_File
      (File_Name       : String;
-      File_Existed    : out Boolean;
-      Ref             : out File_Reference;
       Visited         : Boolean := True;
       Emit_Warning    : Boolean := False;
       Gnatchop_File   : String  := "";
-      Gnatchop_Offset : Integer := 0);
+      Gnatchop_Offset : Integer := 0)
+      return            File_Reference;
    --  Add a new reference to a file in the table. Ref is used to return the
-   --  index in the table where this file is stored On exit, File_Existed is
-   --  True if the file was already in the table Visited is the value which
+   --  index in the table where this file is stored. Visited is the value which
    --  will be used in the table (if True, the file will not be returned by
    --  Next_Unvisited_File). If Emit_Warning is True and the ali file does
    --  not exist or does not have cross-referencing information, then a
@@ -133,35 +119,49 @@ package Xr_Tabls is
      (File   : File_Reference;
       Line   : Natural;
       Column : Natural);
-   --  Add a new reference in a file, which the user has provided
-   --  on the command line. This is used for a optimized matching
-   --  algorithm.
+   --  Add a new reference in a file, which the user has provided on the
+   --  command line. This is used for an optimized matching algorithm.
 
    procedure Add_Reference
-     (Declaration : Declaration_Reference;
-      File_Ref    : File_Reference;
-      Line        : Natural;
-      Column      : Natural;
-      Ref_Type    : Character);
+     (Declaration   : Declaration_Reference;
+      File_Ref      : File_Reference;
+      Line          : Natural;
+      Column        : Natural;
+      Ref_Type      : Character;
+      Labels_As_Ref : Boolean);
    --  Add a new reference (Ref_Type = 'r'), body (Ref_Type = 'b') or
-   --  modification (Ref_Type = 'm') to an entity
-
-   type Compare_Result is (LessThan, Equal, GreaterThan);
-   function Compare (Ref1, Ref2 : Reference) return Compare_Result;
-   function Compare
-     (Decl1 : Declaration_Reference;
-      File2 : File_Reference;
-      Line2 : Integer;
-      Col2  : Integer;
-      Symb2 : String)
-      return  Compare_Result;
-   --  Compare two references
-
-   function First_Body (Decl : Declaration_Reference) return Reference;
-   function First_Declaration return Declaration_Reference;
-   function First_Modif (Decl : Declaration_Reference) return Reference;
-   function First_Reference (Decl : Declaration_Reference) return Reference;
-   --  Initialize the iterators
+   --  modification (Ref_Type = 'm') to an entity. If Labels_As_Ref is True,
+   --  then the references to the entity after the end statements ("end Foo")
+   --  are counted as actual references. This means that the entity will never
+   --  be reported as unreferenced (for instance in the case of gnatxref -u).
+
+   function Get_Declarations
+     (Sorted : Boolean := True)
+      return   Declaration_Array_Access;
+   --  Return a sorted list of all the declarations in the application.
+   --  Freeing this array is the responsability of the caller, however it
+   --  shouldn't free the actual contents of the array, which are pointers
+   --  to internal data
+
+   function References_Count
+     (Decl       : Declaration_Reference;
+      Get_Reads  : Boolean := False;
+      Get_Writes : Boolean := False;
+      Get_Bodies : Boolean := False)
+      return       Natural;
+   --  Return the number of references in Decl for the categories specified
+   --  by the Get_* parameters (read-only accesses, write accesses and bodies)
+
+   function Get_References
+     (Decl : Declaration_Reference;
+      Get_Reads  : Boolean := False;
+      Get_Writes : Boolean := False;
+      Get_Bodies : Boolean := False)
+      return       Reference_Array_Access;
+   --  Return a sorted list of all references to the entity in decl.
+   --  The parameters Get_* are used to specify what kind of references
+   --  should be merged and returned (read-only accesses, write accesses
+   --  and bodies).
 
    function Get_Column (Decl : Declaration_Reference) return String;
    function Get_Column (Ref : Reference) return String;
@@ -176,7 +176,7 @@ package Xr_Tabls is
 
    function Get_Parent
      (Decl : Declaration_Reference)
-     return Declaration_Reference;
+      return Declaration_Reference;
    --  Returns reference to Decl's parent declaration
 
    function Get_Emit_Warning (File : File_Reference) return Boolean;
@@ -230,17 +230,24 @@ package Xr_Tabls is
    function Get_Line     (Ref : Reference)              return String;
    function Get_Symbol   (Decl : Declaration_Reference) return String;
    function Get_Type     (Decl : Declaration_Reference) return Character;
-   --  Functions that return the content of a declaration
+   function Is_Parameter (Decl : Declaration_Reference) return Boolean;
+   --  Functions that return the contents of a declaration
 
    function Get_Source_Line (Ref : Reference)              return String;
    function Get_Source_Line (Decl : Declaration_Reference) return String;
    --  Return the source line associated with the reference
 
    procedure Grep_Source_Files;
-   --  Parse all the source files which have at least one reference, and
-   --  grep the appropriate lines so that we'll be able to display them.
-   --  This function should be called once all the .ali files have been
-   --  parsed, and only if the appropriate user switch has been used.
+   --  Parse all the source files which have at least one reference,
+   --  and grep the appropriate source lines so that we'll be able to
+   --  display them.  This function should be called once all the .ali
+   --  files have been parsed, and only if the appropriate user switch
+   --  has been used (gnatfind -s).
+   --
+   --  Note: To save memory, the strings for the source lines are shared.
+   --  Thus it is no longer possible to free the references, or we would
+   --  free the same chunk multiple times. It doesn't matter, though, since
+   --  this is only called once, prior to exiting gnatfind.
 
    function Longest_File_Name return Natural;
    --  Returns the longest file name found
@@ -256,27 +263,35 @@ package Xr_Tabls is
    --  Returns True if File:Line:Column was given on the command line
    --  by the user
 
-   function Next (Decl : Declaration_Reference) return Declaration_Reference;
-   function Next (Ref  : Reference)             return Reference;
-   --  Returns the next declaration, or Empty_Declaration
-
    function Next_Unvisited_File return File_Reference;
    --  Returns the next unvisited library file in the list
-   --  If there is no more unvisited file, return Empty_File
+   --  If there is no more unvisited file, return Empty_File.
+   --  Two calls to this subprogram will return different files.
 
    procedure Set_Default_Match (Value : Boolean);
    --  Set the default value for match in declarations.
    --  This is used so that if no file was provided in the
    --  command line, then every file match
 
-   procedure Set_Directory
-     (File : File_Reference;
-      Dir  : String);
-   --  Set the directory for a file
+   procedure Reset_Directory (File : File_Reference);
+   --  Reset the cached directory for file. Next time Get_File is
+   --  called, the directory willl be recomputed.
 
-   procedure Set_Unvisited (File_Ref : in File_Reference);
+   procedure Set_Unvisited (File_Ref : File_Reference);
    --  Set File_Ref as unvisited. So Next_Unvisited_File will return it.
 
+   procedure Read_File
+     (File_Name : String;
+      Contents  : out GNAT.OS_Lib.String_Access);
+   --  Reads File_Name into the newly allocated strig Contents. A
+   --  Types.EOF character will be added to the returned Contents to
+   --  simplify parsing. Name_Error is raised if the file was not found.
+   --  End_Error is raised if the file could not be read correctly. For
+   --  most systems correct reading means that the number of bytes read
+   --  is equal to the file size. The exception is OpenVMS where correct
+   --  reading means that the number of bytes read is less than or equal
+   --  to the file size.
+
 private
    type Project_File (Src_Dir_Length, Obj_Dir_Length : Natural) is record
       Src_Dir : String (1 .. Src_Dir_Length);
@@ -291,8 +306,6 @@ private
    --  This is actually a list of all the directories to be searched,
    --  either for source files or for library files
 
-   type String_Access is access all String;
-
    type Ref_In_File;
    type Ref_In_File_Ptr is access all Ref_In_File;
 
@@ -306,14 +319,17 @@ private
    type File_Reference is access all File_Record;
 
    Empty_File : constant File_Reference := null;
+   type Cst_String_Access is access constant String;
 
-   type File_Record (File_Length : Natural) is record
-      File            : String (1 .. File_Length);
-      Dir             : String_Access   := null;
+   procedure Free (Str : in out Cst_String_Access);
+
+   type File_Record is record
+      File            : Cst_String_Access;
+      Dir             : GNAT.OS_Lib.String_Access;
       Lines           : Ref_In_File_Ptr := null;
       Visited         : Boolean         := False;
       Emit_Warning    : Boolean         := False;
-      Gnatchop_File   : String_Access   := null;
+      Gnatchop_File   : GNAT.OS_Lib.String_Access   := null;
       Gnatchop_Offset : Integer         := 0;
       Next            : File_Reference  := null;
    end record;
@@ -322,6 +338,9 @@ private
    --  extracted From. Gnatchop_Offset contains the index of the first line of
    --  File within Gnatchop_File. These two fields are used to properly support
    --  gnatchop files and pragma Source_Reference.
+   --
+   --  Lines is used for files that were given on the command line, to
+   --  memorize the lines and columns that the user specified.
 
    type Reference_Record;
    type Reference is access all Reference_Record;
@@ -332,12 +351,13 @@ private
       File        : File_Reference;
       Line        : Natural;
       Column      : Natural;
-      Source_Line : Ada.Strings.Unbounded.Unbounded_String;
+      Source_Line : Cst_String_Access;
       Next        : Reference := null;
    end record;
    --  File is a reference to the Ada source file
    --  Source_Line is the Line as it appears in the source file. This
-   --  field is only used when the switch is set on the command line
+   --  field is only used when the switch is set on the command line of
+   --  gnatfind.
 
    type Declaration_Record;
    type Declaration_Reference is access all Declaration_Record;
@@ -345,30 +365,22 @@ private
    Empty_Declaration : constant Declaration_Reference := null;
 
    type Declaration_Record (Symbol_Length : Natural) is record
-      Symbol     : String (1 .. Symbol_Length);
-      Decl       : aliased Reference_Record;
-      Decl_Type  : Character;
-      Body_Ref   : Reference := null;
-      Ref_Ref    : Reference := null;
-      Modif_Ref  : Reference := null;
-      Match      : Boolean := False;
-      Par_Symbol : Declaration_Reference := null;
-      Next       : Declaration_Reference := null;
-   end record;
-
-   type File_Table is record
-      Table        : File_Reference := null;
-      Longest_Name : Natural := 0;
-   end record;
-
-   type Entity_Table is record
-      Table : Declaration_Reference := null;
+      Key          : Cst_String_Access;
+      Symbol       : String (1 .. Symbol_Length);
+      Decl         : Reference;
+      Is_Parameter : Boolean := False; -- True if entity is subprog param
+      Decl_Type    : Character;
+      Body_Ref     : Reference := null;
+      Ref_Ref      : Reference := null;
+      Modif_Ref    : Reference := null;
+      Match        : Boolean := False;
+      Par_Symbol   : Declaration_Reference := null;
+      Next         : Declaration_Reference := null;
    end record;
+   --  The lists of referenced (Body_Ref, Ref_Ref and Modif_Ref) are
+   --  kept unsorted until the results needs to be printed. This saves
+   --  lots of time while the internal tables are created.
 
-   pragma Inline (First_Body);
-   pragma Inline (First_Declaration);
-   pragma Inline (First_Modif);
-   pragma Inline (First_Reference);
    pragma Inline (Get_Column);
    pragma Inline (Get_Emit_Warning);
    pragma Inline (Get_File);
@@ -377,6 +389,4 @@ private
    pragma Inline (Get_Symbol);
    pragma Inline (Get_Type);
    pragma Inline (Longest_File_Name);
-   pragma Inline (Next);
-
 end Xr_Tabls;