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, 783 insertions, 0 deletions

diff --git a/gcc/ada/prepcomp.adb b/gcc/ada/prepcomp.adb
new file mode 100644
index 00000000000..f131d7e4d13
--- /dev/null
+++ b/gcc/ada/prepcomp.adb
@@ -0,0 +1,783 @@
+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT COMPILER COMPONENTS                         --
+--                                                                          --
+--                             P R E P C O M P                              --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--          Copyright (C) 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- --
+-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
+-- for  more details.  You should have  received  a copy of the GNU General --
+-- Public License  distributed with GNAT;  see file COPYING.  If not, write --
+-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
+-- MA 02111-1307, USA.                                                      --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+with Ada.Unchecked_Deallocation;
+
+with Errout;   use Errout;
+with Namet;    use Namet;
+with Lib.Writ; use Lib.Writ;
+with Opt;      use Opt;
+with Osint;    use Osint;
+with Prep;     use Prep;
+with Scans;    use Scans;
+with Scn;      use Scn;
+with Sinput.L; use Sinput.L;
+with Stringt;  use Stringt;
+with Table;
+
+package body Prepcomp is
+
+   No_Preprocessing : Boolean := True;
+   --  Set to True if there is at least one source that needs to be
+   --  preprocessed.
+
+   Source_Index_Of_Preproc_Data_File : Source_File_Index := No_Source_File;
+
+   --  The following variable should be a constant, but this is not
+   --  possible. Warnings are Off because it is never assigned a value.
+
+   pragma Warnings (Off);
+   No_Mapping : Prep.Symbol_Table.Instance;
+   pragma Warnings (On);
+
+   type String_Ptr is access String;
+   type String_Array is array (Positive range <>) of String_Ptr;
+   type String_Array_Ptr is access String_Array;
+
+   procedure Free is
+      new Ada.Unchecked_Deallocation (String_Array, String_Array_Ptr);
+
+   Symbol_Definitions : String_Array_Ptr := new String_Array (1 .. 4);
+   --  An extensible array to temporarily stores symbol definitions specified
+   --  on the command line with -gnateD switches.
+
+   Last_Definition : Natural := 0;
+   --  Index of last symbol definition in array Symbol_Definitions
+
+   type Preproc_Data is record
+      Mapping      : Symbol_Table.Instance;
+      File_Name    : Name_Id   := No_Name;
+      Deffile      : String_Id := No_String;
+      Undef_False  : Boolean   := False;
+      Always_Blank : Boolean   := False;
+      Comments     : Boolean   := False;
+      List_Symbols : Boolean   := False;
+      Processed    : Boolean   := False;
+   end record;
+   --  Structure to keep the preprocessing data for a file name or for the
+   --  default (when Name_Id = No_Name).
+
+   No_Preproc_Data : constant Preproc_Data :=
+     (Mapping      => No_Mapping,
+      File_Name    => No_Name,
+      Deffile      => No_String,
+      Undef_False  => False,
+      Always_Blank => False,
+      Comments     => False,
+      List_Symbols => False,
+      Processed    => False);
+
+   Default_Data : Preproc_Data := No_Preproc_Data;
+   --  The preprocessing data to be used when no specific preprocessing data
+   --  is specified for a source.
+
+   Default_Data_Defined : Boolean := False;
+   --  True if source for which no specific preprocessing is specified need to
+   --  be preprocess with the Default_Data.
+
+   Current_Data : Preproc_Data := No_Preproc_Data;
+
+   package Preproc_Data_Table is new Table.Table
+     (Table_Component_Type => Preproc_Data,
+      Table_Index_Type     => Int,
+      Table_Low_Bound      => 1,
+      Table_Initial        => 5,
+      Table_Increment      => 5,
+      Table_Name           => "Prepcomp.Preproc_Data_Table");
+   --  Table to store the specific preprocessing data
+
+   Command_Line_Symbols : Symbol_Table.Instance;
+   --  A table to store symbol definitions specified on the command line with
+   --  -gnateD switches.
+
+   package Dependencies is new Table.Table
+     (Table_Component_Type => Source_File_Index,
+      Table_Index_Type     => Int,
+      Table_Low_Bound      => 1,
+      Table_Initial        => 5,
+      Table_Increment      => 5,
+      Table_Name           => "Prepcomp.Dependencies");
+   --  Table to store the dependencies on preprocessing files
+
+   procedure Add_Command_Line_Symbols;
+   --  Add the command line symbol definitions, if any, to the
+   --  Prep.Mapping table.
+
+   procedure Skip_To_End_Of_Line;
+   --  Ignore errors and scan up to the next end of line or the end of file
+
+   ------------------------------
+   -- Add_Command_Line_Symbols --
+   ------------------------------
+
+   procedure Add_Command_Line_Symbols is
+      Symbol_Id : Prep.Symbol_Id;
+   begin
+      for J in 1 .. Symbol_Table.Last (Command_Line_Symbols) loop
+         Symbol_Id := Prep.Index_Of (Command_Line_Symbols.Table (J).Symbol);
+
+         if Symbol_Id = No_Symbol then
+            Symbol_Table.Increment_Last (Prep.Mapping);
+            Symbol_Id := Symbol_Table.Last (Prep.Mapping);
+         end if;
+
+         Prep.Mapping.Table (Symbol_Id) := Command_Line_Symbols.Table (J);
+      end loop;
+   end Add_Command_Line_Symbols;
+
+   ----------------------
+   -- Add_Dependencies --
+   ----------------------
+
+   procedure Add_Dependencies is
+   begin
+      for Index in 1 .. Dependencies.Last loop
+         Add_Preprocessing_Dependency (Dependencies.Table (Index));
+      end loop;
+   end Add_Dependencies;
+
+   ---------------------------
+   -- Add_Symbol_Definition --
+   ---------------------------
+
+   procedure Add_Symbol_Definition (Def : String) is
+   begin
+      --  If Symbol_Definitions is not large enough, double it
+
+      if Last_Definition = Symbol_Definitions'Last then
+         declare
+            New_Symbol_Definitions : constant String_Array_Ptr :=
+              new String_Array (1 .. 2 * Last_Definition);
+
+         begin
+            New_Symbol_Definitions (Symbol_Definitions'Range) :=
+              Symbol_Definitions.all;
+            Free (Symbol_Definitions);
+            Symbol_Definitions := New_Symbol_Definitions;
+         end;
+      end if;
+
+      Last_Definition := Last_Definition + 1;
+      Symbol_Definitions (Last_Definition) := new String'(Def);
+   end Add_Symbol_Definition;
+
+   -------------------
+   -- Check_Symbols --
+   -------------------
+
+   procedure Check_Symbols is
+   begin
+      --  If there is at least one switch -gnateD specified
+
+      if Symbol_Table.Last (Command_Line_Symbols) >= 1 then
+         Current_Data := No_Preproc_Data;
+         No_Preprocessing := False;
+         Current_Data.Processed := True;
+
+         --  Start with an empty, initialized mapping table; use Prep.Mapping,
+         --  because Prep.Index_Of uses Prep.Mapping.
+
+         Prep.Mapping := No_Mapping;
+         Symbol_Table.Init (Prep.Mapping);
+
+         --  Add the command line symbols
+
+         Add_Command_Line_Symbols;
+
+         --  Put the resulting Prep.Mapping in Current_Data, and immediately
+         --  set Prep.Mapping to nil.
+
+         Current_Data.Mapping := Prep.Mapping;
+         Prep.Mapping := No_Mapping;
+
+         --  Set the default data
+
+         Default_Data := Current_Data;
+         Default_Data_Defined := True;
+      end if;
+   end Check_Symbols;
+
+   ------------------------------
+   -- Parse_Preprocessing_Data --
+   ------------------------------
+
+   procedure Parse_Preprocessing_Data_File (N : File_Name_Type) is
+      OK : Boolean := False;
+      Dash_Location : Source_Ptr;
+      Symbol_Data : Prep.Symbol_Data;
+      Symbol_Id   : Prep.Symbol_Id;
+      T : constant Nat := Total_Errors_Detected;
+
+   begin
+      --  Load the preprocessing data file
+
+      Source_Index_Of_Preproc_Data_File := Load_Preprocessing_Data_File (N);
+
+      --  Fail if preprocessing data file cannot be found
+
+      if Source_Index_Of_Preproc_Data_File = No_Source_File then
+         Get_Name_String (N);
+         Fail ("preprocessing data file """,
+               Name_Buffer (1 .. Name_Len),
+               """ not found");
+      end if;
+
+      --  Initialize the sanner and set its behavior for a processing data file
+      Scn.Scanner.Initialize_Scanner
+        (No_Unit, Source_Index_Of_Preproc_Data_File);
+      Scn.Scanner.Set_End_Of_Line_As_Token (True);
+      Scn.Scanner.Reset_Special_Characters;
+
+      For_Each_Line :
+      loop
+         <<Scan_Line>>
+         Scan;
+
+         exit For_Each_Line when Token = Tok_EOF;
+
+         if Token = Tok_End_Of_Line then
+            goto Scan_Line;
+         end if;
+
+         --  Line is not empty
+
+         OK := False;
+         No_Preprocessing := False;
+         Current_Data := No_Preproc_Data;
+
+         case Token is
+            when Tok_Asterisk =>
+
+               --  Default data
+
+               if Default_Data_Defined then
+                  Error_Msg
+                    ("multiple default preprocessing data", Token_Ptr);
+
+               else
+                  OK := True;
+                  Default_Data_Defined := True;
+               end if;
+
+            when Tok_String_Literal =>
+
+               --  Specific data
+
+               String_To_Name_Buffer (String_Literal_Id);
+               Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+               Current_Data.File_Name := Name_Find;
+               OK := True;
+
+               for Index in 1 .. Preproc_Data_Table.Last loop
+                  if Current_Data.File_Name =
+                       Preproc_Data_Table.Table (Index).File_Name
+                  then
+                     Error_Msg_Name_1 := Current_Data.File_Name;
+                     Error_Msg
+                       ("multiple preprocessing data for{", Token_Ptr);
+                     OK := False;
+                     exit;
+                  end if;
+               end loop;
+
+            when others =>
+               Error_Msg ("`'*` or literal string expected", Token_Ptr);
+         end case;
+
+         --  If there is a problem, skip the line
+
+         if not OK then
+            Skip_To_End_Of_Line;
+            goto Scan_Line;
+         end if;
+
+         --  Scan past the * or the literal string
+
+         Scan;
+
+         --  A literal string in second position is a definition file
+
+         if Token = Tok_String_Literal then
+            Current_Data.Deffile := String_Literal_Id;
+            Current_Data.Processed := False;
+            Scan;
+
+         else
+            --  If there is no definition file, set Processed to True now
+
+            Current_Data.Processed := True;
+         end if;
+
+         --  Start with an empty, initialized mapping table; use Prep.Mapping,
+         --  because Prep.Index_Of uses Prep.Mapping.
+
+         Prep.Mapping := No_Mapping;
+         Symbol_Table.Init (Prep.Mapping);
+
+         --  Check the switches that may follow
+
+         while Token /= Tok_End_Of_Line and then Token /= Tok_EOF loop
+
+            if Token /= Tok_Minus then
+               Error_Msg ("`'-` expected", Token_Ptr);
+               Skip_To_End_Of_Line;
+               goto Scan_Line;
+            end if;
+
+            --  Keep the location of the '-' for possible error reporting
+
+            Dash_Location := Token_Ptr;
+
+            --  Scan past the '-'
+
+            Scan;
+            OK := False;
+            Change_Reserved_Keyword_To_Symbol;
+
+            --  An identifier (or a reserved word converted to an
+            --  identifier) is expected and there must be no blank space
+            --  between the '-' and the identifier.
+
+            if Token = Tok_Identifier
+              and then Token_Ptr = Dash_Location + 1
+            then
+               Get_Name_String (Token_Name);
+
+               --  Check the character in the source, because the case is
+               --  significant.
+
+               case Sinput.Source (Token_Ptr) is
+                  when 'u' =>
+
+                     --  Undefined symbol are False
+
+                     if Name_Len = 1 then
+                        Current_Data.Undef_False := True;
+                        OK := True;
+                     end if;
+
+                  when 'b' =>
+
+                     --  Blank lines
+
+                     if Name_Len = 1 then
+                        Current_Data.Always_Blank := True;
+                        OK := True;
+                     end if;
+
+                  when 'c' =>
+
+                     --  Comment removed lines
+
+                     if Name_Len = 1 then
+                        Current_Data.Comments := True;
+                        OK := True;
+                     end if;
+
+                  when 's' =>
+
+                     --  List symbols
+
+                     if Name_Len = 1 then
+                        Current_Data.List_Symbols := True;
+                        OK := True;
+                     end if;
+
+                  when 'D' =>
+
+                     --  Symbol definition
+
+                     OK := Name_Len > 1;
+
+                     if OK then
+
+                        --  A symbol must be an Ada identifier; it cannot start
+                        --  with an underline or a digit.
+
+                        if Name_Buffer (2) = '_'
+                          or Name_Buffer (2) in '0' .. '9'
+                        then
+                           Error_Msg ("symbol expected", Token_Ptr + 1);
+                           Skip_To_End_Of_Line;
+                           goto Scan_Line;
+                        end if;
+
+                        --  Get the name id of the symbol
+
+                        Symbol_Data.On_The_Command_Line := True;
+                        Name_Buffer (1 .. Name_Len - 1) :=
+                          Name_Buffer (2 .. Name_Len);
+                        Name_Len := Name_Len - 1;
+                        Symbol_Data.Symbol := Name_Find;
+
+                        if Name_Buffer (1 .. Name_Len) = "if"
+                          or else Name_Buffer (1 .. Name_Len) = "else"
+                          or else Name_Buffer (1 .. Name_Len) = "elsif"
+                          or else Name_Buffer (1 .. Name_Len) = "end"
+                          or else Name_Buffer (1 .. Name_Len) = "not"
+                          or else Name_Buffer (1 .. Name_Len) = "and"
+                          or else Name_Buffer (1 .. Name_Len) = "then"
+                        then
+                           Error_Msg ("symbol expected", Token_Ptr + 1);
+                           Skip_To_End_Of_Line;
+                           goto Scan_Line;
+                        end if;
+
+                        --  Get the name id of the original symbol, with
+                        --  possibly capital letters.
+
+                        Name_Len := Integer (Scan_Ptr - Token_Ptr - 1);
+
+                        for J in 1 .. Name_Len loop
+                           Name_Buffer (J) :=
+                             Sinput.Source (Token_Ptr + Text_Ptr (J));
+                        end loop;
+
+                        Symbol_Data.Original := Name_Find;
+
+                        --  Scan past D<symbol>
+
+                        Scan;
+
+                        if Token /= Tok_Equal then
+                           Error_Msg ("`=` expected", Token_Ptr);
+                           Skip_To_End_Of_Line;
+                           goto Scan_Line;
+                        end if;
+
+                        --  Scan past '='
+
+                        Scan;
+
+                        --  Here any reserved word is OK
+
+                        Change_Reserved_Keyword_To_Symbol
+                          (All_Keywords => True);
+
+                        --  Value can be an identifier (or a reserved word)
+                        --  or a literal string.
+
+                        case Token is
+                           when Tok_String_Literal =>
+                              Symbol_Data.Is_A_String := True;
+                              Symbol_Data.Value := String_Literal_Id;
+
+                           when Tok_Identifier =>
+                              Symbol_Data.Is_A_String := False;
+                              Start_String;
+
+                              for J in Token_Ptr .. Scan_Ptr - 1 loop
+                                 Store_String_Char (Sinput.Source (J));
+                              end loop;
+
+                              Symbol_Data.Value := End_String;
+
+                           when others =>
+                              Error_Msg
+                                ("literal string or identifier expected",
+                                 Token_Ptr);
+                              Skip_To_End_Of_Line;
+                              goto Scan_Line;
+                        end case;
+
+                        --  If symbol already exists, replace old definition
+                        --  by new one.
+
+                        Symbol_Id := Prep.Index_Of (Symbol_Data.Symbol);
+
+                        --  Otherwise, add a new entry in the table.
+
+                        if Symbol_Id = No_Symbol then
+                           Symbol_Table.Increment_Last (Prep.Mapping);
+                           Symbol_Id := Symbol_Table.Last (Mapping);
+                        end if;
+
+                        Prep.Mapping.Table (Symbol_Id) := Symbol_Data;
+                     end if;
+
+                  when others =>
+                     null;
+               end case;
+
+               Scan;
+            end if;
+
+            if not OK then
+               Error_Msg ("invalid switch", Dash_Location);
+               Skip_To_End_Of_Line;
+               goto Scan_Line;
+            end if;
+         end loop;
+
+         --  Add the command line symbols, if any, possibly replacing symbols
+         --  just defined.
+
+         Add_Command_Line_Symbols;
+
+         --  Put the resulting Prep.Mapping in Current_Data, and immediately
+         --  set Prep.Mapping to nil.
+
+         Current_Data.Mapping := Prep.Mapping;
+         Prep.Mapping := No_Mapping;
+
+         --  Record Current_Data
+
+         if Current_Data.File_Name = No_Name then
+            Default_Data := Current_Data;
+
+         else
+            Preproc_Data_Table.Increment_Last;
+            Preproc_Data_Table.Table (Preproc_Data_Table.Last) := Current_Data;
+         end if;
+
+         Current_Data := No_Preproc_Data;
+      end loop For_Each_Line;
+
+      Scn.Scanner.Set_End_Of_Line_As_Token (False);
+
+      --  Fail if there were errors in the preprocessing data file
+
+      if Total_Errors_Detected > T then
+         Errout.Finalize;
+         Fail ("errors found in preprocessing data file """,
+               Get_Name_String (N),
+               """");
+      end if;
+
+      --  Record the dependency on the preprocessor data file
+
+      Dependencies.Increment_Last;
+      Dependencies.Table (Dependencies.Last) :=
+        Source_Index_Of_Preproc_Data_File;
+   end Parse_Preprocessing_Data_File;
+
+   ---------------------------
+   -- Prepare_To_Preprocess --
+   ---------------------------
+
+   procedure Prepare_To_Preprocess
+     (Source               : File_Name_Type;
+      Preprocessing_Needed : out Boolean)
+   is
+      Default : Boolean := False;
+      Index   : Int := 0;
+
+   begin
+      --  By default, preprocessing is not needed
+
+      Preprocessing_Needed := False;
+
+      if No_Preprocessing then
+         return;
+      end if;
+
+      --  First, look for preprocessing data specific to the current source
+
+      for J in 1 .. Preproc_Data_Table.Last loop
+         if Preproc_Data_Table.Table (J).File_Name = Source then
+            Index := J;
+            Current_Data := Preproc_Data_Table.Table (J);
+            exit;
+         end if;
+      end loop;
+
+      --  If no specific preprocessing data, then take the default
+
+      if Index = 0 then
+         if Default_Data_Defined then
+            Current_Data := Default_Data;
+            Default := True;
+
+         else
+            --  If no default, then nothing to do
+
+            return;
+         end if;
+      end if;
+
+      --  Set the preprocessing flags according to the preprocessing data
+
+      if Current_Data.Comments and then not Current_Data.Always_Blank then
+         Comment_Deleted_Lines := True;
+         Blank_Deleted_Lines   := False;
+
+      else
+         Comment_Deleted_Lines := False;
+         Blank_Deleted_Lines   := True;
+      end if;
+
+      Undefined_Symbols_Are_False := Current_Data.Undef_False;
+      List_Preprocessing_Symbols  := Current_Data.List_Symbols;
+
+      --  If not already done it, process the definition file
+
+      if Current_Data.Processed then
+         --  Set Prep.Mapping
+
+         Prep.Mapping := Current_Data.Mapping;
+
+      else
+         --  First put the mapping in Prep.Mapping, because Prep.Parse_Def_File
+         --  works on Prep.Mapping.
+
+         Prep.Mapping := Current_Data.Mapping;
+
+         String_To_Name_Buffer (Current_Data.Deffile);
+
+         declare
+            N : constant Name_Id := Name_Find;
+            Deffile : constant Source_File_Index :=  Load_Definition_File (N);
+            Add_Deffile : Boolean := True;
+            T : constant Nat := Total_Errors_Detected;
+
+         begin
+            if Deffile = No_Source_File then
+               Fail ("definition file """,
+                     Get_Name_String (N),
+                     """ cannot be found");
+            end if;
+
+            --  Initialize the preprocessor and set the characteristics of the
+            --  scanner for a definition file.
+
+            Prep.Initialize
+              (Error_Msg         => Errout.Error_Msg'Access,
+               Scan              => Scn.Scanner.Scan'Access,
+               Set_Ignore_Errors => Errout.Set_Ignore_Errors'Access,
+               Put_Char          => null,
+               New_EOL           => null);
+
+            Scn.Scanner.Set_End_Of_Line_As_Token (True);
+            Scn.Scanner.Reset_Special_Characters;
+
+            --  Initialize the scanner and process the definition file
+
+            Scn.Scanner.Initialize_Scanner (No_Unit, Deffile);
+            Prep.Parse_Def_File;
+
+            --  Reset the behaviour of the scanner to the default
+
+            Scn.Scanner.Set_End_Of_Line_As_Token (False);
+
+            --  Fail if errors were found while processing the definition file
+
+            if T /= Total_Errors_Detected then
+               Errout.Finalize;
+               Fail ("errors found in definition file """,
+                     Get_Name_String (N),
+                     """");
+            end if;
+
+            for Index in 1 .. Dependencies.Last loop
+               if Dependencies.Table (Index) = Deffile then
+                  Add_Deffile := False;
+                  exit;
+               end if;
+            end loop;
+
+            if Add_Deffile then
+               Dependencies.Increment_Last;
+               Dependencies.Table (Dependencies.Last) := Deffile;
+            end if;
+         end;
+
+         --  Get back the mapping, indicate that the definition file is
+         --  processed and store back the preprocessing data.
+
+         Current_Data.Mapping := Prep.Mapping;
+         Current_Data.Processed := True;
+
+         if Default then
+            Default_Data := Current_Data;
+
+         else
+            Preproc_Data_Table.Table (Index) := Current_Data;
+         end if;
+      end if;
+
+      Preprocessing_Needed := True;
+   end Prepare_To_Preprocess;
+
+   ---------------------------------------------
+   -- Process_Command_Line_Symbol_Definitions --
+   ---------------------------------------------
+
+   procedure Process_Command_Line_Symbol_Definitions is
+      Symbol_Data : Prep.Symbol_Data;
+      Found : Boolean := False;
+
+   begin
+      Symbol_Table.Init (Command_Line_Symbols);
+
+      --  The command line definitions have been stored temporarily in
+      --  array Symbol_Definitions.
+
+      for Index in 1 .. Last_Definition loop
+         --  Check each symbol definition, fail immediately if syntax is not
+         --  correct.
+
+         Check_Command_Line_Symbol_Definition
+           (Definition => Symbol_Definitions (Index).all,
+            Data => Symbol_Data);
+         Found := False;
+
+         --  If there is already a definition for this symbol, replace the old
+         --  definition by this one.
+
+         for J in 1 .. Symbol_Table.Last (Command_Line_Symbols) loop
+            if Command_Line_Symbols.Table (J).Symbol = Symbol_Data.Symbol then
+               Command_Line_Symbols.Table (J) := Symbol_Data;
+               Found := True;
+               exit;
+            end if;
+         end loop;
+
+         --  Otherwise, create a new entry in the table
+
+         if not Found then
+            Symbol_Table.Increment_Last (Command_Line_Symbols);
+            Command_Line_Symbols.Table
+              (Symbol_Table.Last (Command_Line_Symbols)) := Symbol_Data;
+         end if;
+      end loop;
+   end Process_Command_Line_Symbol_Definitions;
+
+   -------------------------
+   -- Skip_To_End_Of_Line --
+   -------------------------
+
+   procedure Skip_To_End_Of_Line is
+   begin
+      Set_Ignore_Errors (To => True);
+
+      while Token /= Tok_End_Of_Line and then Token /= Tok_EOF loop
+         Scan;
+      end loop;
+
+      Set_Ignore_Errors (To => False);
+   end Skip_To_End_Of_Line;
+
+end Prepcomp;