* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,

	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.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_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	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-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	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-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]


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

1 files changed, 60 insertions, 60 deletions

diff --git a/gcc/ada/xr_tabls.ads b/gcc/ada/xr_tabls.ads
index 960b35def8e..9e122e00526 100644
--- a/gcc/ada/xr_tabls.ads
+++ b/gcc/ada/xr_tabls.ads
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---                            $Revision: 1.18 $
+--                            $Revision$
 --                                                                          --
---         Copyright (C) 1998-2000 Free Software Foundation, Inc.           --
+--         Copyright (C) 1998-2002 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- --
@@ -112,25 +112,24 @@ package Xr_Tabls is
    --  The parent declaration (Symbol in file File_Ref at position Line and
    --  Column) information is added to Declaration.
 
-   procedure Add_File
-     (File_Name    : String;
-      File_Existed : out Boolean;
-      Ref          : out File_Reference;
-      Visited      : Boolean := True;
-      Emit_Warning : Boolean := False;
-      Gnatchop_File : String := "";
+   procedure Add_To_Xref_File
+     (File_Name       : String;
+      File_Existed    : out Boolean;
+      Ref             : out File_Reference;
+      Visited         : Boolean := True;
+      Emit_Warning    : Boolean := False;
+      Gnatchop_File   : String  := "";
       Gnatchop_Offset : Integer := 0);
-   --  Add a new reference to a file in the table. Ref is used to return
-   --  the index in the table where this file is stored On exit,
-   --  File_Existed is True if the file was already in the table Visited is
-   --  the value which will be used in the table (if True, the file will
-   --  not be returned by Next_Unvisited_File). If Emit_Warning is True and
-   --  the ali file does not exist or does not have cross-referencing
-   --  informations, then a warning will be emitted.
-   --  Gnatchop_File is the name of the file that File_Name was extracted from
-   --  through a call to "gnatchop -r" (with pragma Source_Reference).
-   --  Gnatchop_Offset should be the index of the first line of File_Name
-   --  withing Gnatchop_File.
+   --  Add a new reference to a file in the table. Ref is used to return the
+   --  index in the table where this file is stored On exit, File_Existed is
+   --  True if the file was already in the table Visited is the value which
+   --  will be used in the table (if True, the file will not be returned by
+   --  Next_Unvisited_File). If Emit_Warning is True and the ali file does
+   --  not exist or does not have cross-referencing information, then a
+   --  warning will be emitted. Gnatchop_File is the name of the file that
+   --  File_Name was extracted from through a call to "gnatchop -r" (using
+   --  pragma Source_Reference). Gnatchop_Offset should be the index of the
+   --  first line of File_Name within the Gnatchop_File.
 
    procedure Add_Line
      (File   : File_Reference;
@@ -162,7 +161,7 @@ package Xr_Tabls is
 
    function First_Body (Decl : Declaration_Reference) return Reference;
    function First_Declaration return Declaration_Reference;
-   function First_Modif  (Decl : Declaration_Reference) return Reference;
+   function First_Modif (Decl : Declaration_Reference) return Reference;
    function First_Reference (Decl : Declaration_Reference) return Reference;
    --  Initialize the iterators
 
@@ -186,16 +185,21 @@ package Xr_Tabls is
    --  Returns the Emit_Warning field of the structure
 
    function Get_Gnatchop_File
-     (File : File_Reference; With_Dir : Boolean := False) return String;
+     (File     : File_Reference;
+      With_Dir : Boolean := False)
+      return     String;
    function Get_Gnatchop_File
-     (Ref : Reference; With_Dir : Boolean := False) return String;
+     (Ref      : Reference;
+      With_Dir : Boolean := False)
+      return     String;
    function Get_Gnatchop_File
-     (Decl : Declaration_Reference; With_Dir : Boolean := False) return String;
+     (Decl     : Declaration_Reference;
+      With_Dir : Boolean := False)
+      return     String;
    --  Return the name of the file that File was extracted from through a
-   --  call to "gnatchop -r".
-   --  The file name for File is returned if File wasn't extracted from such a
-   --  file. The directory will be given only if With_Dir is True.
-
+   --  call to "gnatchop -r". The file name for File is returned if File
+   --  was not extracted from such a file. The directory will be given only
+   --  if With_Dir is True.
 
    function Get_File
      (Decl     : Declaration_Reference;
@@ -213,25 +217,24 @@ package Xr_Tabls is
      (File     : File_Reference;
       With_Dir : Boolean := False;
       Strip    : Natural := 0)
-     return     String;
-   --  Returns the file name (and its directory if With_Dir is True or
-   --  the user as used the -f switch on the command line.
-   --  If Strip is not 0, then the last Strip-th "-..." substrings are
-   --  removed first. For instance, with Strip=2, a file name
-   --  "parent-child1-child2-child3.ali" would be returned as
-   --  "parent-child1.ali". This is used when looking for the ALI file to use
-   --  for a package, since for separates with have to use the parent's ALI.
-   --
-   --  "" is returned if there is no such parent unit
-
-   function Get_File_Ref (Ref : Reference) return File_Reference;
-   function Get_Line (Decl : Declaration_Reference) return String;
-   function Get_Line (Ref : Reference) return String;
-   function Get_Symbol (Decl : Declaration_Reference) return String;
-   function Get_Type (Decl : Declaration_Reference) return Character;
+      return     String;
+   --  Returns the file name (and its directory if With_Dir is True or the
+   --  user has used the -f switch on the command line. If Strip is not 0,
+   --  then the last Strip-th "-..." substrings are removed first. For
+   --  instance, with Strip=2, a file name "parent-child1-child2-child3.ali"
+   --  would be returned as "parent-child1.ali". This is used when looking
+   --  for the ALI file to use for a package, since for separates with have
+   --  to use the parent's ALI. The null string is returned if there is no
+   --  such parent unit
+
+   function Get_File_Ref (Ref : Reference)              return File_Reference;
+   function Get_Line     (Decl : Declaration_Reference) return String;
+   function Get_Line     (Ref : Reference)              return String;
+   function Get_Symbol   (Decl : Declaration_Reference) return String;
+   function Get_Type     (Decl : Declaration_Reference) return Character;
    --  Functions that return the content of a declaration
 
-   function Get_Source_Line (Ref : Reference) return String;
+   function Get_Source_Line (Ref : Reference)              return String;
    function Get_Source_Line (Decl : Declaration_Reference) return String;
    --  Return the source line associated with the reference
 
@@ -256,7 +259,7 @@ package Xr_Tabls is
    --  by the user
 
    function Next (Decl : Declaration_Reference) return Declaration_Reference;
-   function Next (Ref : Reference) return Reference;
+   function Next (Ref  : Reference)             return Reference;
    --  Returns the next declaration, or Empty_Declaration
 
    function Next_Unvisited_File return File_Reference;
@@ -276,7 +279,6 @@ package Xr_Tabls is
    procedure Set_Unvisited (File_Ref : in File_Reference);
    --  Set File_Ref as unvisited. So Next_Unvisited_File will return it.
 
-
 private
    type Project_File (Src_Dir_Length, Obj_Dir_Length : Natural) is record
       Src_Dir : String (1 .. Src_Dir_Length);
@@ -308,23 +310,21 @@ private
    Empty_File : constant File_Reference := null;
 
    type File_Record (File_Length : Natural) is record
-      File         : String (1 .. File_Length);
-      Dir          : String_Access   := null;
-      Lines        : Ref_In_File_Ptr := null;
-      Visited      : Boolean         := False;
-      Emit_Warning : Boolean         := False;
-      Gnatchop_File : String_Access  := null;
-      Gnatchop_Offset : Integer      := 0;
-      Next         : File_Reference  := null;
+      File            : String (1 .. File_Length);
+      Dir             : String_Access   := null;
+      Lines           : Ref_In_File_Ptr := null;
+      Visited         : Boolean         := False;
+      Emit_Warning    : Boolean         := False;
+      Gnatchop_File   : String_Access   := null;
+      Gnatchop_Offset : Integer         := 0;
+      Next            : File_Reference  := null;
    end record;
    --  Holds a reference to a source file, that was referenced in at least one
-   --  ALI file.
-   --  Gnatchop_File will contain the name of the file that File was extracted
-   --  From. Gnatchop_Offset contains the index of the first line of File
-   --  within Gnatchop_File. These two fields are used to properly support
+   --  ALI file. Gnatchop_File will contain the name of the file that File was
+   --  extracted From. Gnatchop_Offset contains the index of the first line of
+   --  File within Gnatchop_File. These two fields are used to properly support
    --  gnatchop files and pragma Source_Reference.
 
-
    type Reference_Record;
    type Reference is access all Reference_Record;