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, 9 insertions, 1719 deletions

diff --git a/gcc/ada/a-stwibo.adb b/gcc/ada/a-stwibo.adb
index 982ca638c71..9d0661a6c96 100644
--- a/gcc/ada/a-stwibo.adb
+++ b/gcc/ada/a-stwibo.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2001 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- --
@@ -31,123 +31,11 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Strings.Wide_Maps;   use Ada.Strings.Wide_Maps;
-with Ada.Strings.Wide_Search;
-
 package body Ada.Strings.Wide_Bounded is
 
    package body Generic_Bounded_Length is
 
       ---------
-      -- "&" --
-      ---------
-
-      function "&"
-        (Left  : in Bounded_Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left.Length;
-         Rlen   : constant Length_Range := Right.Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen > Max_Length then
-            raise Ada.Strings.Length_Error;
-         else
-            Result.Length := Nlen;
-            Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-            Result.Data (Llen + 1 .. Nlen) := Right.Data (1 .. Rlen);
-         end if;
-
-         return Result;
-      end "&";
-
-      function "&"
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left.Length;
-
-         Nlen   : constant Natural      := Llen + Right'Length;
-
-      begin
-         if Nlen > Max_Length then
-            raise Ada.Strings.Length_Error;
-         else
-            Result.Length := Nlen;
-            Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-            Result.Data (Llen + 1 .. Nlen) := Right;
-         end if;
-         return Result;
-      end "&";
-
-      function "&"
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left'Length;
-         Rlen   : constant Length_Range := Right.Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen > Max_Length then
-            raise Ada.Strings.Length_Error;
-         else
-            Result.Length := Nlen;
-            Result.Data (1 .. Llen) := Left;
-            Result.Data (Llen + 1 .. Nlen) := Right.Data (1 .. Rlen);
-         end if;
-
-         return Result;
-      end "&";
-
-      function "&"
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_Character)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left.Length;
-
-      begin
-         if Llen = Max_Length then
-            raise Ada.Strings.Length_Error;
-         else
-            Result.Length := Llen + 1;
-            Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-            Result.Data (Result.Length) := Right;
-         end if;
-
-         return Result;
-      end "&";
-
-      function "&"
-        (Left  : in Wide_Character;
-         Right : in Bounded_Wide_String)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Rlen   : Length_Range := Right.Length;
-
-      begin
-         if Rlen = Max_Length then
-            raise Ada.Strings.Length_Error;
-         else
-            Result.Length := Rlen + 1;
-            Result.Data (1) := Left;
-            Result.Data (2 .. Result.Length) := Right.Data (1 .. Rlen);
-         end if;
-
-         return Result;
-      end "&";
-
-      ---------
       -- "*" --
       ---------
 
@@ -156,20 +44,8 @@ package body Ada.Strings.Wide_Bounded is
          Right : in Wide_Character)
          return  Bounded_Wide_String
       is
-         Result : Bounded_Wide_String;
-
       begin
-         if Left > Max_Length then
-            raise Ada.Strings.Length_Error;
-         else
-            Result.Length := Left;
-
-            for J in 1 .. Left loop
-               Result.Data (J) := Right;
-            end loop;
-         end if;
-
-         return Result;
+         return Times (Left, Right, Max_Length);
       end "*";
 
       function "*"
@@ -177,1187 +53,10 @@ package body Ada.Strings.Wide_Bounded is
          Right : in Wide_String)
          return  Bounded_Wide_String
       is
-         Result : Bounded_Wide_String;
-         Pos    : Positive         := 1;
-         Rlen   : constant Natural := Right'Length;
-         Nlen   : constant Natural := Left * Rlen;
-
       begin
-         if Nlen > Max_Length then
-            raise Ada.Strings.Index_Error;
-         else
-            Result.Length := Nlen;
-
-            if Nlen > 0 then
-               for J in 1 .. Left loop
-                  Result.Data (Pos .. Pos + Rlen - 1) := Right;
-                  Pos := Pos + Rlen;
-               end loop;
-            end if;
-         end if;
-
-         return Result;
+         return Times (Left, Right, Max_Length);
       end "*";
 
-      function "*"
-        (Left  : in Natural;
-         Right : in Bounded_Wide_String)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Pos    : Positive := 1;
-         Rlen   : constant Length_Range := Right.Length;
-         Nlen   : constant Natural      := Left * Rlen;
-
-      begin
-         if Nlen > Max_Length then
-            raise Ada.Strings.Length_Error;
-
-         else
-            Result.Length := Nlen;
-
-            if Nlen > 0 then
-               for J in 1 .. Left loop
-                  Result.Data (Pos .. Pos + Rlen - 1) :=
-                    Right.Data (1 .. Rlen);
-                  Pos := Pos + Rlen;
-               end loop;
-            end if;
-         end if;
-
-         return Result;
-      end "*";
-
-      ---------
-      -- "<" --
-      ---------
-
-      function "<"
-        (Left  : in Bounded_Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) < Right.Data (1 .. Right.Length);
-      end "<";
-
-      function "<"
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) < Right;
-      end "<";
-
-      function "<"
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left < Right.Data (1 .. Right.Length);
-      end "<";
-
-      ----------
-      -- "<=" --
-      ----------
-
-      function "<="
-        (Left  : in Bounded_Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) <= Right.Data (1 .. Right.Length);
-      end "<=";
-
-      function "<="
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) <= Right;
-      end "<=";
-
-      function "<="
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left <= Right.Data (1 .. Right.Length);
-      end "<=";
-
-      ---------
-      -- "=" --
-      ---------
-
-      function "="
-        (Left  : in Bounded_Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Length = Right.Length
-           and then Left.Data (1 .. Left.Length) =
-                    Right.Data (1 .. Right.Length);
-      end "=";
-
-      function "="
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Length = Right'Length
-           and then Left.Data (1 .. Left.Length) = Right;
-      end "=";
-
-      function "="
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left'Length = Right.Length
-           and then Left = Right.Data (1 .. Right.Length);
-      end "=";
-
-      ---------
-      -- ">" --
-      ---------
-
-      function ">"
-        (Left  : in Bounded_Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) > Right.Data (1 .. Right.Length);
-      end ">";
-
-      function ">"
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) > Right;
-      end ">";
-
-      function ">"
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left > Right.Data (1 .. Right.Length);
-      end ">";
-
-      ----------
-      -- ">=" --
-      ----------
-
-      function ">="
-        (Left  : in Bounded_Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) >= Right.Data (1 .. Right.Length);
-      end ">=";
-
-      function ">="
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left.Data (1 .. Left.Length) >= Right;
-      end ">=";
-
-      function ">="
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String)
-         return  Boolean
-      is
-      begin
-         return Left >= Right.Data (1 .. Right.Length);
-      end ">=";
-
-      ------------
-      -- Append --
-      ------------
-
-      --  Case of Bounded_Wide_String and Bounded_Wide_String
-
-      function Append
-        (Left, Right : in Bounded_Wide_String;
-         Drop        : in Strings.Truncation  := Strings.Error)
-         return        Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left.Length;
-         Rlen   : constant Length_Range := Right.Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen <= Max_Length then
-            Result.Length := Nlen;
-            Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-            Result.Data (Llen + 1 .. Nlen) := Right.Data (1 .. Rlen);
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Llen >= Max_Length then -- only case is Llen = Max_Length
-                     Result.Data := Right.Data;
-
-                  else
-                     Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-                     Result.Data (Llen + 1 .. Max_Length) :=
-                       Right.Data (1 .. Max_Length - Llen);
-                  end if;
-
-               when Strings.Left =>
-                  if Rlen >= Max_Length then -- only case is Rlen = Max_Length
-                     Result.Data := Right.Data;
-
-                  else
-                     Result.Data (1 .. Max_Length - Rlen) :=
-                       Left.Data (Llen - (Max_Length - Rlen - 1) .. Llen);
-                     Result.Data (Max_Length - Rlen + 1 .. Max_Length) :=
-                       Right.Data (1 .. Rlen);
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Append;
-
-      procedure Append
-        (Source   : in out Bounded_Wide_String;
-         New_Item : in Bounded_Wide_String;
-         Drop     : in Truncation  := Error)
-      is
-         Llen   : constant Length_Range := Source.Length;
-         Rlen   : constant Length_Range := New_Item.Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen <= Max_Length then
-            Source.Length := Nlen;
-            Source.Data (Llen + 1 .. Nlen) := New_Item.Data (1 .. Rlen);
-
-         else
-            Source.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Llen < Max_Length then
-                     Source.Data (Llen + 1 .. Max_Length) :=
-                       New_Item.Data (1 .. Max_Length - Llen);
-                  end if;
-
-               when Strings.Left =>
-                  if Rlen >= Max_Length then -- only case is Rlen = Max_Length
-                     Source.Data := New_Item.Data;
-
-                  else
-                     Source.Data (1 .. Max_Length - Rlen) :=
-                       Source.Data (Llen - (Max_Length - Rlen - 1) .. Llen);
-                     Source.Data (Max_Length - Rlen + 1 .. Max_Length) :=
-                       New_Item.Data (1 .. Rlen);
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-      end Append;
-
-      --  Case of Bounded_Wide_String and Wide_String
-
-      function Append
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_String;
-         Drop  : in Strings.Truncation := Strings.Error)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left.Length;
-         Rlen   : constant Length_Range := Right'Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen <= Max_Length then
-            Result.Length := Nlen;
-            Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-            Result.Data (Llen + 1 .. Nlen) := Right;
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Llen >= Max_Length then -- only case is Llen = Max_Length
-                     Result.Data := Left.Data;
-
-                  else
-                     Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-                     Result.Data (Llen + 1 .. Max_Length) :=
-                       Right (Right'First .. Right'First - 1 +
-                                              Max_Length - Llen);
-
-                  end if;
-
-               when Strings.Left =>
-                  if Rlen >= Max_Length then
-                     Result.Data (1 .. Max_Length) :=
-                       Right (Right'Last - (Max_Length - 1) .. Right'Last);
-
-                  else
-                     Result.Data (1 .. Max_Length - Rlen) :=
-                       Left.Data (Llen - (Max_Length - Rlen - 1) .. Llen);
-                     Result.Data (Max_Length - Rlen + 1 .. Max_Length) :=
-                       Right;
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Append;
-
-      procedure Append
-        (Source   : in out Bounded_Wide_String;
-         New_Item : in Wide_String;
-         Drop     : in Truncation  := Error)
-      is
-         Llen   : constant Length_Range := Source.Length;
-         Rlen   : constant Length_Range := New_Item'Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen <= Max_Length then
-            Source.Length := Nlen;
-            Source.Data (Llen + 1 .. Nlen) := New_Item;
-
-         else
-            Source.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Llen < Max_Length then
-                     Source.Data (Llen + 1 .. Max_Length) :=
-                       New_Item (New_Item'First ..
-                                       New_Item'First - 1 + Max_Length - Llen);
-                  end if;
-
-               when Strings.Left =>
-                  if Rlen >= Max_Length then
-                     Source.Data (1 .. Max_Length) :=
-                       New_Item (New_Item'Last - (Max_Length - 1) ..
-                                                                New_Item'Last);
-
-                  else
-                     Source.Data (1 .. Max_Length - Rlen) :=
-                       Source.Data (Llen - (Max_Length - Rlen - 1) .. Llen);
-                     Source.Data (Max_Length - Rlen + 1 .. Max_Length) :=
-                       New_Item;
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-      end Append;
-
-      --  Case of Wide_String and Bounded_Wide_String
-
-      function Append
-        (Left  : in Wide_String;
-         Right : in Bounded_Wide_String;
-         Drop  : in Strings.Truncation := Strings.Error)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left'Length;
-         Rlen   : constant Length_Range := Right.Length;
-         Nlen   : constant Natural      := Llen + Rlen;
-
-      begin
-         if Nlen <= Max_Length then
-            Result.Length := Nlen;
-            Result.Data (1 .. Llen) := Left;
-            Result.Data (Llen + 1 .. Llen + Rlen) := Right.Data (1 .. Rlen);
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Llen >= Max_Length then
-                     Result.Data (1 .. Max_Length) :=
-                        Left (Left'First .. Left'First + (Max_Length - 1));
-
-                  else
-                     Result.Data (1 .. Llen) := Left;
-                     Result.Data (Llen + 1 .. Max_Length) :=
-                       Right.Data (1 .. Max_Length - Llen);
-                  end if;
-
-               when Strings.Left =>
-                  if Rlen >= Max_Length then
-                     Result.Data (1 .. Max_Length) :=
-                       Right.Data (Rlen - (Max_Length - 1) .. Rlen);
-
-                  else
-                     Result.Data (1 .. Max_Length - Rlen) :=
-                       Left (Left'Last - (Max_Length - Rlen - 1) .. Left'Last);
-                     Result.Data (Max_Length - Rlen + 1 .. Max_Length) :=
-                       Right.Data (1 .. Rlen);
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Append;
-
-      --  Case of Bounded_Wide_String and Wide_Character
-
-      function Append
-        (Left  : in Bounded_Wide_String;
-         Right : in Wide_Character;
-         Drop  : in Strings.Truncation := Strings.Error)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Llen   : constant Length_Range := Left.Length;
-
-      begin
-         if Llen  < Max_Length then
-            Result.Length := Llen + 1;
-            Result.Data (1 .. Llen) := Left.Data (1 .. Llen);
-            Result.Data (Llen + 1) := Right;
-            return Result;
-
-         else
-            case Drop is
-               when Strings.Right =>
-                  return Left;
-
-               when Strings.Left =>
-                  Result.Length := Max_Length;
-                  Result.Data (1 .. Max_Length - 1) :=
-                    Left.Data (2 .. Max_Length);
-                  Result.Data (Max_Length) := Right;
-                  return Result;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-      end Append;
-
-      procedure Append
-        (Source   : in out Bounded_Wide_String;
-         New_Item : in Wide_Character;
-         Drop     : in Truncation  := Error)
-      is
-         Llen   : constant Length_Range := Source.Length;
-
-      begin
-         if Llen  < Max_Length then
-            Source.Length := Llen + 1;
-            Source.Data (Llen + 1) := New_Item;
-
-         else
-            Source.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  null;
-
-               when Strings.Left =>
-                  Source.Data (1 .. Max_Length - 1) :=
-                    Source.Data (2 .. Max_Length);
-                  Source.Data (Max_Length) := New_Item;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-      end Append;
-
-      --  Case of Wide_Character and Bounded_Wide_String
-
-      function Append
-        (Left  : in Wide_Character;
-         Right : in Bounded_Wide_String;
-         Drop  : in Strings.Truncation := Strings.Error)
-         return  Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Rlen   : constant Length_Range := Right.Length;
-
-      begin
-         if Rlen < Max_Length then
-            Result.Length := Rlen + 1;
-            Result.Data (1) := Left;
-            Result.Data (2 .. Rlen + 1) := Right.Data (1 .. Rlen);
-            return Result;
-
-         else
-            case Drop is
-               when Strings.Right =>
-                  Result.Length := Max_Length;
-                  Result.Data (1) := Left;
-                  Result.Data (2 .. Max_Length) :=
-                    Right.Data (1 .. Max_Length - 1);
-                  return Result;
-
-               when Strings.Left =>
-                  return Right;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-      end Append;
-
-      -----------
-      -- Count --
-      -----------
-
-      function Count
-        (Source  : in Bounded_Wide_String;
-         Pattern : in Wide_String;
-         Mapping : in Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
-         return    Natural
-      is
-      begin
-         return
-           Wide_Search.Count
-             (Source.Data (1 .. Source.Length), Pattern, Mapping);
-      end Count;
-
-      function Count
-        (Source  : in Bounded_Wide_String;
-         Pattern : in Wide_String;
-         Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
-         return    Natural
-      is
-      begin
-         return
-           Wide_Search.Count
-             (Source.Data (1 .. Source.Length), Pattern, Mapping);
-      end Count;
-
-      function Count
-        (Source : in Bounded_Wide_String;
-         Set    : in Wide_Maps.Wide_Character_Set)
-         return   Natural
-      is
-      begin
-         return Wide_Search.Count (Source.Data (1 .. Source.Length), Set);
-      end Count;
-
-      ------------
-      -- Delete --
-      ------------
-
-      function Delete
-        (Source  : in Bounded_Wide_String;
-         From    : in Positive;
-         Through : in Natural)
-         return    Bounded_Wide_String
-      is
-         Slen       : constant Natural := Source.Length;
-         Num_Delete : constant Integer := Through - From + 1;
-         Result     : Bounded_Wide_String;
-
-      begin
-         if Num_Delete <= 0 then
-            return Source;
-
-         elsif From > Slen + 1 then
-            raise Ada.Strings.Index_Error;
-
-         elsif Through >= Slen then
-            Result.Length := From - 1;
-            Result.Data (1 .. From - 1) := Source.Data (1 .. From - 1);
-            return Result;
-
-         else
-            Result.Length := Slen - Num_Delete;
-            Result.Data (1 .. From - 1) := Source.Data (1 .. From - 1);
-            Result.Data (From .. Result.Length) :=
-              Source.Data (Through + 1 .. Slen);
-            return Result;
-         end if;
-      end Delete;
-
-      procedure Delete
-        (Source  : in out Bounded_Wide_String;
-         From    : in Positive;
-         Through : in Natural)
-      is
-         Slen       : constant Natural := Source.Length;
-         Num_Delete : constant Integer := Through - From + 1;
-
-      begin
-         if Num_Delete <= 0 then
-            return;
-
-         elsif From > Slen + 1 then
-            raise Ada.Strings.Index_Error;
-
-         elsif Through >= Slen then
-            Source.Length := From - 1;
-
-         else
-            Source.Length := Slen - Num_Delete;
-            Source.Data (From .. Source.Length) :=
-              Source.Data (Through + 1 .. Slen);
-         end if;
-      end Delete;
-
-      -------------
-      -- Element --
-      -------------
-
-      function Element
-        (Source : in Bounded_Wide_String;
-         Index  : in Positive)
-         return   Wide_Character
-      is
-      begin
-         if Index in 1 .. Source.Length then
-            return Source.Data (Index);
-         else
-            raise Strings.Index_Error;
-         end if;
-      end Element;
-
-      ----------------
-      -- Find_Token --
-      ----------------
-
-      procedure Find_Token
-        (Source : in Bounded_Wide_String;
-         Set    : in Wide_Maps.Wide_Character_Set;
-         Test   : in Strings.Membership;
-         First  : out Positive;
-         Last   : out Natural)
-      is
-      begin
-         Wide_Search.Find_Token
-           (Source.Data (1 .. Source.Length), Set, Test, First, Last);
-      end Find_Token;
-
-
-      ----------
-      -- Head --
-      ----------
-
-      function Head
-        (Source : in Bounded_Wide_String;
-         Count  : in Natural;
-         Pad    : in Wide_Character := Wide_Space;
-         Drop   : in Strings.Truncation := Strings.Error)
-         return   Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Slen   : constant Natural := Source.Length;
-         Npad   : constant Integer := Count - Slen;
-
-      begin
-         if Npad <= 0 then
-            Result.Length := Count;
-            Result.Data (1 .. Count) := Source.Data (1 .. Count);
-
-         elsif Count <= Max_Length then
-            Result.Length := Count;
-            Result.Data (1 .. Slen) := Source.Data (1 .. Slen);
-            Result.Data (Slen + 1 .. Count) := (others => Pad);
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  Result.Data (1 .. Slen) := Source.Data (1 .. Slen);
-                  Result.Data (Slen + 1 .. Max_Length) := (others => Pad);
-
-               when Strings.Left =>
-                  if Npad >= Max_Length then
-                     Result.Data := (others => Pad);
-
-                  else
-                     Result.Data (1 .. Max_Length - Npad) :=
-                       Source.Data (Count - Max_Length + 1 .. Slen);
-                     Result.Data (Max_Length - Npad + 1 .. Max_Length) :=
-                       (others => Pad);
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Head;
-
-      procedure Head
-        (Source : in out Bounded_Wide_String;
-         Count  : in Natural;
-         Pad    : in Wide_Character  := Wide_Space;
-         Drop   : in Truncation := Error)
-      is
-         Slen   : constant Natural := Source.Length;
-         Npad   : constant Integer := Count - Slen;
-         Temp   : Wide_String (1 .. Max_Length);
-
-      begin
-         if Npad <= 0 then
-            Source.Length := Count;
-
-         elsif Count <= Max_Length then
-            Source.Length := Count;
-            Source.Data (Slen + 1 .. Count) := (others => Pad);
-
-         else
-            Source.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  Source.Data (Slen + 1 .. Max_Length) := (others => Pad);
-
-               when Strings.Left =>
-                  if Npad > Max_Length then
-                     Source.Data := (others => Pad);
-
-                  else
-                     Temp := Source.Data;
-                     Source.Data (1 .. Max_Length - Npad) :=
-                       Temp (Count - Max_Length + 1 .. Slen);
-
-                     for J in Max_Length - Npad + 1 .. Max_Length loop
-                        Source.Data (J) := Pad;
-                     end loop;
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-      end Head;
-
-      -----------
-      -- Index --
-      -----------
-
-      function Index
-        (Source  : in Bounded_Wide_String;
-         Pattern : in Wide_String;
-         Going   : in Strings.Direction := Strings.Forward;
-         Mapping : in Wide_Maps.Wide_Character_Mapping := Wide_Maps.Identity)
-         return    Natural
-      is
-      begin
-         return Wide_Search.Index
-           (Source.Data (1 .. Source.Length), Pattern, Going, Mapping);
-      end Index;
-
-      function Index
-        (Source  : in Bounded_Wide_String;
-         Pattern : in Wide_String;
-         Going   : in Direction := Forward;
-         Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
-         return    Natural
-      is
-      begin
-         return Wide_Search.Index
-           (Source.Data (1 .. Source.Length), Pattern, Going, Mapping);
-      end Index;
-
-      function Index
-        (Source : in Bounded_Wide_String;
-         Set    : in Wide_Maps.Wide_Character_Set;
-         Test   : in Strings.Membership := Strings.Inside;
-         Going  : in Strings.Direction  := Strings.Forward)
-         return   Natural
-      is
-      begin
-         return Wide_Search.Index
-           (Source.Data (1 .. Source.Length), Set, Test, Going);
-      end Index;
-
-      ---------------------
-      -- Index_Non_Blank --
-      ---------------------
-
-      function Index_Non_Blank
-        (Source : in Bounded_Wide_String;
-         Going  : in Strings.Direction := Strings.Forward)
-         return   Natural
-      is
-      begin
-         return
-           Wide_Search.Index_Non_Blank
-             (Source.Data (1 .. Source.Length), Going);
-      end Index_Non_Blank;
-
-      ------------
-      -- Insert --
-      ------------
-
-      function Insert
-        (Source   : in Bounded_Wide_String;
-         Before   : in Positive;
-         New_Item : in Wide_String;
-         Drop     : in Strings.Truncation := Strings.Error)
-         return     Bounded_Wide_String
-      is
-         Slen    : constant Natural := Source.Length;
-         Nlen    : constant Natural := New_Item'Length;
-         Tlen    : constant Natural := Slen + Nlen;
-         Blen    : constant Natural := Before - 1;
-         Alen    : constant Integer := Slen - Blen;
-         Droplen : constant Integer := Tlen - Max_Length;
-         Result  : Bounded_Wide_String;
-
-         --  Tlen is the length of the total string before possible truncation.
-         --  Blen, Alen are the lengths of the before and after pieces of the
-         --  source string.
-
-      begin
-         if Alen < 0 then
-            raise Ada.Strings.Index_Error;
-
-         elsif Droplen <= 0 then
-            Result.Length := Tlen;
-            Result.Data (1 .. Blen) := Source.Data (1 .. Blen);
-            Result.Data (Before .. Before + Nlen - 1) := New_Item;
-            Result.Data (Before + Nlen .. Tlen) :=
-              Source.Data (Before .. Slen);
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  Result.Data (1 .. Blen) := Source.Data (1 .. Blen);
-
-                  if Droplen > Alen then
-                     Result.Data (Before .. Max_Length) :=
-                       New_Item (New_Item'First
-                                   .. New_Item'First + Max_Length - Before);
-                  else
-                     Result.Data (Before .. Before + Nlen - 1) := New_Item;
-                     Result.Data (Before + Nlen .. Max_Length) :=
-                       Source.Data (Before .. Slen - Droplen);
-                  end if;
-
-               when Strings.Left =>
-                  Result.Data (Max_Length - (Alen - 1) .. Max_Length) :=
-                    Source.Data (Before .. Slen);
-
-                  if Droplen >= Blen then
-                     Result.Data (1 .. Max_Length - Alen) :=
-                       New_Item (New_Item'Last - (Max_Length - Alen) + 1
-                                   .. New_Item'Last);
-                  else
-                     Result.Data
-                       (Blen - Droplen + 1 .. Max_Length - Alen) :=
-                         New_Item;
-                     Result.Data (1 .. Blen - Droplen) :=
-                       Source.Data (Droplen + 1 .. Blen);
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Insert;
-
-      procedure Insert
-        (Source   : in out Bounded_Wide_String;
-         Before   : in Positive;
-         New_Item : in Wide_String;
-         Drop     : in Strings.Truncation := Strings.Error)
-      is
-      begin
-         --  We do a double copy here because this is one of the situations
-         --  in which we move data to the right, and at least at the moment,
-         --  GNAT is not handling such cases correctly ???
-
-         Source := Insert (Source, Before, New_Item, Drop);
-      end Insert;
-
-      ------------
-      -- Length --
-      ------------
-
-      function Length (Source : in Bounded_Wide_String) return Length_Range is
-      begin
-         return Source.Length;
-      end Length;
-
-      ---------------
-      -- Overwrite --
-      ---------------
-
-      function Overwrite
-        (Source    : in Bounded_Wide_String;
-         Position  : in Positive;
-         New_Item  : in Wide_String;
-         Drop      : in Strings.Truncation := Strings.Error)
-         return      Bounded_Wide_String
-      is
-         Result  : Bounded_Wide_String;
-         Endpos  : constant Natural  := Position + New_Item'Length - 1;
-         Slen    : constant Natural  := Source.Length;
-         Droplen : Natural;
-
-      begin
-         if Position > Slen + 1 then
-            raise Ada.Strings.Index_Error;
-
-         elsif New_Item'Length = 0 then
-            return Source;
-
-         elsif Endpos <= Slen then
-            Result.Length := Source.Length;
-            Result.Data (1 .. Slen) := Source.Data (1 .. Slen);
-            Result.Data (Position .. Endpos) := New_Item;
-            return Result;
-
-         elsif Endpos <= Max_Length then
-            Result.Length := Endpos;
-            Result.Data (1 .. Position - 1) := Source.Data (1 .. Position - 1);
-            Result.Data (Position .. Endpos) := New_Item;
-            return Result;
-
-         else
-            Result.Length := Max_Length;
-            Droplen := Endpos - Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  Result.Data (1 .. Position - 1) :=
-                    Source.Data (1 .. Position - 1);
-
-                  Result.Data (Position .. Max_Length) :=
-                    New_Item (New_Item'First .. New_Item'Last - Droplen);
-                  return Result;
-
-               when Strings.Left =>
-                  if New_Item'Length >= Max_Length then
-                     Result.Data (1 .. Max_Length) :=
-                        New_Item (New_Item'Last - Max_Length + 1 ..
-                                  New_Item'Last);
-                     return Result;
-
-                  else
-                     Result.Data (1 .. Max_Length - New_Item'Length) :=
-                       Source.Data (Droplen + 1 .. Position - 1);
-                     Result.Data
-                       (Max_Length - New_Item'Length + 1 .. Max_Length) :=
-                         New_Item;
-                     return Result;
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-      end Overwrite;
-
-      procedure Overwrite
-        (Source    : in out Bounded_Wide_String;
-         Position  : in Positive;
-         New_Item  : in Wide_String;
-         Drop      : in Strings.Truncation := Strings.Error)
-      is
-         Endpos  : constant Positive := Position + New_Item'Length - 1;
-         Slen    : constant Natural  := Source.Length;
-         Droplen : Natural;
-
-      begin
-         if Position > Slen + 1 then
-            raise Ada.Strings.Index_Error;
-
-         elsif Endpos <= Slen then
-            Source.Data (Position .. Endpos) := New_Item;
-
-         elsif Endpos <= Max_Length then
-            Source.Data (Position .. Endpos) := New_Item;
-            Source.Length := Endpos;
-
-         else
-            Source.Length := Max_Length;
-            Droplen := Endpos - Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  Source.Data (Position .. Max_Length) :=
-                    New_Item (New_Item'First .. New_Item'Last - Droplen);
-
-               when Strings.Left =>
-                  if New_Item'Length > Max_Length then
-                     Source.Data (1 .. Max_Length) :=
-                        New_Item (New_Item'Last - Max_Length + 1 ..
-                                  New_Item'Last);
-
-                  else
-                     Source.Data (1 .. Max_Length - New_Item'Length) :=
-                       Source.Data (Droplen + 1 .. Position - 1);
-
-                     Source.Data
-                       (Max_Length - New_Item'Length + 1 .. Max_Length) :=
-                         New_Item;
-                  end if;
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-      end Overwrite;
-
-      ---------------------
-      -- Replace_Element --
-      ---------------------
-
-      procedure Replace_Element
-        (Source : in out Bounded_Wide_String;
-         Index  : in Positive;
-         By     : in Wide_Character)
-      is
-      begin
-         if Index <= Source.Length then
-            Source.Data (Index) := By;
-         else
-            raise Ada.Strings.Index_Error;
-         end if;
-      end Replace_Element;
-
-      -------------------
-      -- Replace_Slice --
-      -------------------
-
-      function Replace_Slice
-        (Source   : in Bounded_Wide_String;
-         Low      : in Positive;
-         High     : in Natural;
-         By       : in Wide_String;
-         Drop     : in Strings.Truncation := Strings.Error)
-         return     Bounded_Wide_String
-      is
-         Slen : constant Natural := Source.Length;
-
-      begin
-         if Low > Slen + 1 then
-            raise Strings.Index_Error;
-
-         elsif High < Low then
-            return Insert (Source, Low, By, Drop);
-
-         else
-            declare
-               Blen    : constant Natural := Natural'Max (0, Low - 1);
-               Alen    : constant Natural := Natural'Max (0, Slen - High);
-               Tlen    : constant Natural := Blen + By'Length + Alen;
-               Droplen : constant Integer := Tlen - Max_Length;
-               Result  : Bounded_Wide_String;
-
-               --  Tlen is the total length of the result string before any
-               --  truncation. Blen and Alen are the lengths of the pieces
-               --  of the original string that end up in the result string
-               --  before and after the replaced slice.
-
-            begin
-               if Droplen <= 0 then
-                  Result.Length := Tlen;
-                  Result.Data (1 .. Blen) := Source.Data (1 .. Blen);
-                  Result.Data (Low .. Low + By'Length - 1) := By;
-                  Result.Data (Low + By'Length .. Tlen) :=
-                    Source.Data (High + 1 .. Slen);
-
-               else
-                  Result.Length := Max_Length;
-
-                  case Drop is
-                     when Strings.Right =>
-                        Result.Data (1 .. Blen) := Source.Data (1 .. Blen);
-
-                        if Droplen > Alen then
-                           Result.Data (Low .. Max_Length) :=
-                             By (By'First .. By'First + Max_Length - Low);
-                        else
-                           Result.Data (Low .. Low + By'Length - 1) := By;
-                           Result.Data (Low + By'Length .. Max_Length) :=
-                             Source.Data (High + 1 .. Slen - Droplen);
-                        end if;
-
-                     when Strings.Left =>
-                        Result.Data (Max_Length - (Alen - 1) .. Max_Length) :=
-                          Source.Data (High + 1 .. Slen);
-
-                        if Droplen >= Blen then
-                           Result.Data (1 .. Max_Length - Alen) :=
-                             By (By'Last - (Max_Length - Alen) + 1 .. By'Last);
-                        else
-                           Result.Data
-                             (Blen - Droplen + 1 .. Max_Length - Alen) := By;
-                           Result.Data (1 .. Blen - Droplen) :=
-                             Source.Data (Droplen + 1 .. Blen);
-                        end if;
-
-                     when Strings.Error =>
-                        raise Ada.Strings.Length_Error;
-                  end case;
-               end if;
-
-               return Result;
-            end;
-         end if;
-      end Replace_Slice;
-
-      procedure Replace_Slice
-        (Source   : in out Bounded_Wide_String;
-         Low      : in Positive;
-         High     : in Natural;
-         By       : in Wide_String;
-         Drop     : in Strings.Truncation := Strings.Error)
-      is
-      begin
-         --  We do a double copy here because this is one of the situations
-         --  in which we move data to the right, and at least at the moment,
-         --  GNAT is not handling such cases correctly ???
-
-         Source := Replace_Slice (Source, Low, High, By, Drop);
-      end Replace_Slice;
-
       ---------------
       -- Replicate --
       ---------------
@@ -1368,21 +67,8 @@ package body Ada.Strings.Wide_Bounded is
          Drop  : in Strings.Truncation := Strings.Error)
          return  Bounded_Wide_String
       is
-         Result : Bounded_Wide_String;
-
       begin
-         if Count <= Max_Length then
-            Result.Length := Count;
-
-         elsif Drop = Strings.Error then
-            raise Ada.Strings.Length_Error;
-
-         else
-            Result.Length := Max_Length;
-         end if;
-
-         Result.Data (1 .. Result.Length) := (others => Item);
-         return Result;
+         return Super_Replicate (Count, Item, Drop, Max_Length);
       end Replicate;
 
       function Replicate
@@ -1391,420 +77,24 @@ package body Ada.Strings.Wide_Bounded is
          Drop  : in Strings.Truncation := Strings.Error)
          return  Bounded_Wide_String
       is
-         Length : constant Integer := Count * Item'Length;
-         Result : Bounded_Wide_String;
-         Indx   : Positive;
-
       begin
-         if Length <= Max_Length then
-            Result.Length := Length;
-
-            if Length > 0 then
-               Indx := 1;
-
-               for J in 1 .. Count loop
-                  Result.Data (Indx .. Indx + Item'Length - 1) := Item;
-                  Indx := Indx + Item'Length;
-               end loop;
-            end if;
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  Indx := 1;
-
-                  while Indx + Item'Length <= Max_Length + 1 loop
-                     Result.Data (Indx .. Indx + Item'Length - 1) := Item;
-                     Indx := Indx + Item'Length;
-                  end loop;
-
-                  Result.Data (Indx .. Max_Length) :=
-                    Item (Item'First .. Item'First + Max_Length - Indx);
-
-               when Strings.Left =>
-                  Indx := Max_Length;
-
-                  while Indx - Item'Length >= 1 loop
-                     Result.Data (Indx - (Item'Length - 1) .. Indx) := Item;
-                     Indx := Indx - Item'Length;
-                  end loop;
-
-                  Result.Data (1 .. Indx) :=
-                    Item (Item'Last - Indx + 1 .. Item'Last);
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Replicate;
-
-      function Replicate
-        (Count : in Natural;
-         Item  : in Bounded_Wide_String;
-         Drop  : in Strings.Truncation := Strings.Error)
-         return  Bounded_Wide_String
-      is
-      begin
-         return Replicate (Count, Item.Data (1 .. Item.Length), Drop);
+         return Super_Replicate (Count, Item, Drop, Max_Length);
       end Replicate;
 
-      -----------
-      -- Slice --
-      -----------
-
-      function Slice
-        (Source : Bounded_Wide_String;
-         Low    : Positive;
-         High   : Natural)
-         return   Wide_String
-      is
-      begin
-         --  Note: test of High > Length is in accordance with AI95-00128
-
-         if Low > Source.Length + 1 or else High > Source.Length then
-            raise Index_Error;
-
-         else
-            declare
-               Result : Wide_String (1 .. High - Low + 1);
-
-            begin
-               Result := Source.Data (Low .. High);
-               return Result;
-            end;
-         end if;
-      end Slice;
-
-      ----------
-      -- Tail --
-      ----------
-
-      function Tail
-        (Source : in Bounded_Wide_String;
-         Count  : in Natural;
-         Pad    : in Wide_Character := Wide_Space;
-         Drop   : in Strings.Truncation := Strings.Error)
-         return   Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Slen   : constant Natural := Source.Length;
-         Npad   : constant Integer := Count - Slen;
-
-      begin
-         if Npad <= 0 then
-            Result.Length := Count;
-            Result.Data (1 .. Count) :=
-              Source.Data (Slen - (Count - 1) .. Slen);
-
-         elsif Count <= Max_Length then
-            Result.Length := Count;
-            Result.Data (1 .. Npad) := (others => Pad);
-            Result.Data (Npad + 1 .. Count) := Source.Data (1 .. Slen);
-
-         else
-            Result.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Npad >= Max_Length then
-                     Result.Data := (others => Pad);
-
-                  else
-                     Result.Data (1 .. Npad) := (others => Pad);
-                     Result.Data (Npad + 1 .. Max_Length) :=
-                       Source.Data (1 .. Max_Length - Npad);
-                  end if;
-
-               when Strings.Left =>
-                  Result.Data (1 .. Max_Length - Slen) := (others => Pad);
-                  Result.Data (Max_Length - Slen + 1 .. Max_Length) :=
-                    Source.Data (1 .. Slen);
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
-      end Tail;
-
-      procedure Tail
-        (Source : in out Bounded_Wide_String;
-         Count  : in Natural;
-         Pad    : in Wide_Character  := Wide_Space;
-         Drop   : in Truncation := Error)
-      is
-         Slen   : constant Natural := Source.Length;
-         Npad   : constant Integer := Count - Slen;
-         Temp   : Wide_String (1 .. Max_Length) := Source.Data;
-
-      begin
-         if Npad <= 0 then
-            Source.Length := Count;
-            Source.Data (1 .. Count) :=
-              Temp (Slen - (Count - 1) .. Slen);
-
-         elsif Count <= Max_Length then
-            Source.Length := Count;
-            Source.Data (1 .. Npad) := (others => Pad);
-            Source.Data (Npad + 1 .. Count) := Temp (1 .. Slen);
-
-         else
-            Source.Length := Max_Length;
-
-            case Drop is
-               when Strings.Right =>
-                  if Npad >= Max_Length then
-                     Source.Data := (others => Pad);
-
-                  else
-                     Source.Data (1 .. Npad) := (others => Pad);
-                     Source.Data (Npad + 1 .. Max_Length) :=
-                       Temp (1 .. Max_Length - Npad);
-                  end if;
-
-               when Strings.Left =>
-                  for J in 1 .. Max_Length - Slen loop
-                     Source.Data (J) := Pad;
-                  end loop;
-
-                  Source.Data (Max_Length - Slen + 1 .. Max_Length) :=
-                    Temp (1 .. Slen);
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-      end Tail;
 
-      ----------------------------
-      -- To_Bounded_Wide_String --
-      ----------------------------
+      -----------------------
+      -- To_Bounded_String --
+      -----------------------
 
       function To_Bounded_Wide_String
         (Source : in Wide_String;
          Drop   : in Strings.Truncation := Strings.Error)
          return   Bounded_Wide_String
       is
-         Slen   : constant Natural := Source'Length;
-         Result : Bounded_Wide_String;
-
       begin
-         if Slen <= Max_Length then
-            Result.Length := Slen;
-            Result.Data (1 .. Slen) := Source;
-
-         else
-            case Drop is
-               when Strings.Right =>
-                  Result.Length := Max_Length;
-                  Result.Data (1 .. Max_Length) :=
-                    Source (Source'First .. Source'First - 1 + Max_Length);
-
-               when Strings.Left =>
-                  Result.Length := Max_Length;
-                  Result.Data (1 .. Max_Length) :=
-                    Source (Source'Last - (Max_Length - 1) .. Source'Last);
-
-               when Strings.Error =>
-                  raise Ada.Strings.Length_Error;
-            end case;
-         end if;
-
-         return Result;
+         return To_Super_String (Source, Max_Length, Drop);
       end To_Bounded_Wide_String;
 
-      --------------------
-      -- To_Wide_String --
-      --------------------
-
-      function To_Wide_String
-        (Source : in Bounded_Wide_String)
-         return   Wide_String
-      is
-      begin
-         return Source.Data (1 .. Source.Length);
-      end To_Wide_String;
-
-      ---------------
-      -- Translate --
-      ---------------
-
-      function Translate
-        (Source  : in Bounded_Wide_String;
-         Mapping : in Wide_Maps.Wide_Character_Mapping)
-         return    Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-
-      begin
-         Result.Length := Source.Length;
-
-         for J in 1 .. Source.Length loop
-            Result.Data (J) := Value (Mapping, Source.Data (J));
-         end loop;
-
-         return Result;
-      end Translate;
-
-      procedure Translate
-        (Source   : in out Bounded_Wide_String;
-         Mapping  : in Wide_Maps.Wide_Character_Mapping)
-      is
-      begin
-         for J in 1 .. Source.Length loop
-            Source.Data (J) := Value (Mapping, Source.Data (J));
-         end loop;
-      end Translate;
-
-      function Translate
-        (Source  : in Bounded_Wide_String;
-         Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
-         return    Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-
-      begin
-         Result.Length := Source.Length;
-
-         for J in 1 .. Source.Length loop
-            Result.Data (J) := Mapping.all (Source.Data (J));
-         end loop;
-
-         return Result;
-      end Translate;
-
-      procedure Translate
-        (Source  : in out Bounded_Wide_String;
-         Mapping : in Wide_Maps.Wide_Character_Mapping_Function)
-      is
-      begin
-         for J in 1 .. Source.Length loop
-            Source.Data (J) := Mapping.all (Source.Data (J));
-         end loop;
-      end Translate;
-
-      ----------
-      -- Trim --
-      ----------
-
-      function Trim
-        (Source : in Bounded_Wide_String;
-         Side   : in Trim_End)
-         return   Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-         Last   : Natural := Source.Length;
-         First  : Positive := 1;
-
-      begin
-         if Side = Left or else Side = Both then
-            while First <= Last and then Source.Data (First) = ' ' loop
-               First := First + 1;
-            end loop;
-         end if;
-
-         if Side = Right or else Side = Both then
-            while Last >= First and then Source.Data (Last) = ' ' loop
-               Last := Last - 1;
-            end loop;
-         end if;
-
-         Result.Length := Last - First + 1;
-         Result.Data (1 .. Result.Length) := Source.Data (First .. Last);
-         return Result;
-
-      end Trim;
-
-      procedure Trim
-        (Source : in out Bounded_Wide_String;
-         Side   : in Trim_End)
-      is
-         Last   : Length_Range := Source.Length;
-         First  : Positive     := 1;
-         Temp   : Wide_String (1 .. Max_Length);
-
-      begin
-         Temp (1 .. Last) := Source.Data (1 .. Last);
-
-         if Side = Left or else Side = Both then
-            while First <= Last and then Temp (First) = ' ' loop
-               First := First + 1;
-            end loop;
-         end if;
-
-         if Side = Right or else Side = Both then
-            while Last >= First and then Temp (Last) = ' ' loop
-               Last := Last - 1;
-            end loop;
-         end if;
-
-         Source.Length := Last - First + 1;
-         Source.Data (1 .. Source.Length) := Temp (First .. Last);
-
-      end Trim;
-
-      function Trim
-        (Source : in Bounded_Wide_String;
-         Left   : in Wide_Maps.Wide_Character_Set;
-         Right  : in Wide_Maps.Wide_Character_Set)
-         return   Bounded_Wide_String
-      is
-         Result : Bounded_Wide_String;
-
-      begin
-         for First in 1 .. Source.Length loop
-            if not Is_In (Source.Data (First), Left) then
-               for Last in reverse First .. Source.Length loop
-                  if not Is_In (Source.Data (Last), Right) then
-                     Result.Length := Last - First + 1;
-                     Result.Data (1 .. Result.Length) :=
-                        Source.Data (First .. Last);
-                     return Result;
-                  end if;
-               end loop;
-            end if;
-         end loop;
-
-         Result.Length := 0;
-         return Result;
-      end Trim;
-
-      procedure Trim
-        (Source : in out Bounded_Wide_String;
-         Left   : in Wide_Maps.Wide_Character_Set;
-         Right  : in Wide_Maps.Wide_Character_Set)
-      is
-      begin
-         for First in 1 .. Source.Length loop
-            if not Is_In (Source.Data (First), Left) then
-               for Last in reverse First .. Source.Length loop
-                  if not Is_In (Source.Data (Last), Right) then
-                     if First = 1 then
-                        Source.Length := Last;
-                        return;
-                     else
-                        Source.Length := Last - First + 1;
-                        Source.Data (1 .. Source.Length) :=
-                          Source.Data (First .. Last);
-                        return;
-                     end if;
-                  end if;
-               end loop;
-
-               Source.Length := 0;
-               return;
-            end if;
-         end loop;
-
-         Source.Length := 0;
-      end Trim;
-
    end Generic_Bounded_Length;
 
 end Ada.Strings.Wide_Bounded;