* 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, 201 insertions, 36 deletions

diff --git a/gcc/ada/gnatprep.adb b/gcc/ada/gnatprep.adb
index ccff6fc4a3c..23400dac90a 100644
--- a/gcc/ada/gnatprep.adb
+++ b/gcc/ada/gnatprep.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.27 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1996-2001, Free Software Foundation, Inc.         --
+--          Copyright (C) 1996-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- --
@@ -39,8 +39,6 @@ with Gnatvsn;
 procedure GNATprep is
    pragma Ident (Gnatvsn.Gnat_Version_String);
 
-   Version_String : constant String := "$Revision: 1.27 $";
-
    type Strptr is access String;
 
    Usage_Error : exception;
@@ -58,12 +56,23 @@ procedure GNATprep is
    -- Argument Line Data --
    ------------------------
 
-   Infile_Name  : Strptr;
    Outfile_Name : Strptr;
    Deffile_Name : Strptr;
    --  Names of files
 
-   Infile  : File_Type;
+   type Input;
+   type Input_Ptr is access Input;
+   type Input is record
+      File     : File_Type;
+      Next     : Input_Ptr;
+      Prev     : Input_Ptr;
+      Name     : Strptr;
+      Line_Num : Natural := 0;
+   end record;
+   --  Data for the current input file (main input file or included file
+   --  or definition file).
+
+   Infile  : Input_Ptr := new Input;
    Outfile : File_Type;
    Deffile : File_Type;
 
@@ -100,15 +109,13 @@ procedure GNATprep is
    Line_Length : Natural;
    --  Length of line in Line_Buffer
 
-   Line_Num : Natural;
-   --  Current input file line number
-
    Ptr : Natural;
    --  Input scan pointer for line in Line_Buffer
 
    type Keyword is (K_Not, K_Then, K_If, K_Else, K_End, K_Elsif,
                     K_And, K_Or, K_Open_Paren, K_Close_Paren,
-                    K_Defined, K_Andthen, K_Orelse, K_Equal, K_None);
+                    K_Defined, K_Andthen, K_Orelse, K_Equal, K_Include,
+                    K_None);
    --  Keywords that are recognized on preprocessor lines. K_None indicates
    --  that no keyword was present.
 
@@ -131,6 +138,9 @@ procedure GNATprep is
       If_Line : Positive;
       --  Line number for #if line
 
+      If_Name : Strptr;
+      --  File name of #if line
+
       Else_Line : Natural;
       --  Line number for #else line, zero = no else seen yet
 
@@ -141,6 +151,7 @@ procedure GNATprep is
       --  True if either the #if condition or one of the previously seen
       --  #elsif lines was true, meaning that any future #elsif sections
       --  or the #else section, is to be deleted.
+
    end record;
 
    PP_Depth : Natural;
@@ -162,7 +173,7 @@ procedure GNATprep is
 
    procedure Error (Msg : String);
    --  Post error message with given text. The line number is taken from
-   --  Line_Num, and the column number from Ptr.
+   --  Infile.Line_Num, and the column number from Ptr.
 
    function Eval_Condition
      (Parenthesis : Natural := 0;
@@ -184,6 +195,9 @@ procedure GNATprep is
    procedure Help_Page;
    --  Print a help page to summarize the usage of gnatprep
 
+   function Image (N : Natural) return String;
+   --  Returns Natural'Image (N) without the initial space
+
    function Is_Preprocessor_Line return Boolean;
    --  Tests if current line is a preprocessor line, i.e. that its first
    --  non-blank character is a # character. If so, then a result of True
@@ -244,7 +258,7 @@ procedure GNATprep is
    -----------
 
    procedure Error (Msg : String) is
-      L : constant String := Natural'Image (Line_Num);
+      L : constant String := Natural'Image (Infile.Line_Num);
       C : constant String := Natural'Image (Ptr);
 
    begin
@@ -419,6 +433,7 @@ procedure GNATprep is
          when K_Equal =>
 
             --  Read the second part of the statement
+
             Skip_Spaces;
             Start_Sym := Ptr;
 
@@ -510,9 +525,9 @@ procedure GNATprep is
    procedure Help_Page is
    begin
       Put_Line (Standard_Error,
-                "GNAT Preprocessor Version " &
-                Version_String (12 .. 15) &
-                " Copyright 1996-2001 Free Software Foundation, Inc.");
+                "GNAT Preprocessor " &
+                Gnatvsn.Gnat_Version_String &
+                " Copyright 1996-2002 Free Software Foundation, Inc.");
       Put_Line (Standard_Error,
                 "Usage: gnatprep [-bcrsu] [-Dsymbol=value] infile " &
                 "outfile [deffile]");
@@ -533,6 +548,16 @@ procedure GNATprep is
       New_Line (Standard_Error);
    end Help_Page;
 
+   -----------
+   -- Image --
+   -----------
+
+   function Image (N : Natural) return String is
+      Result : constant String := Natural'Image (N);
+   begin
+      return Result (Result'First + 1 .. Result'Last);
+   end Image;
+
    --------------------------
    -- Is_Preprocessor_Line --
    --------------------------
@@ -654,14 +679,16 @@ procedure GNATprep is
    begin
       Open (Deffile, In_File, Deffile_Name.all);
 
-      Line_Num := 0;
+      --  Initialize data for procedure Error
+
+      Infile.Line_Num := 0;
       Current_File_Name := Deffile_Name;
 
       --  Loop through lines in symbol definitions file
 
       while not End_Of_File (Deffile) loop
          Get_Line (Deffile, Line_Buffer, Line_Length);
-         Line_Num := Line_Num + 1;
+         Infile.Line_Num := Infile.Line_Num + 1;
 
          Ptr := 1;
          Skip_Spaces;
@@ -826,6 +853,9 @@ procedure GNATprep is
             elsif Matching_Strings (Sym, "'defined") then
                return K_Defined;
 
+            elsif Matching_Strings (Sym, "include") then
+               return K_Include;
+
             elsif Sym = "(" then
                return K_Open_Paren;
 
@@ -991,8 +1021,8 @@ begin
       begin
          exit when S'Length = 0;
 
-         if Infile_Name = null then
-            Infile_Name := new String'(S);
+         if Infile.Name = null then
+            Infile.Name := new String'(S);
          elsif Outfile_Name = null then
             Outfile_Name := new String'(S);
          elsif Deffile_Name = null then
@@ -1005,7 +1035,7 @@ begin
 
    --  Test we had all the arguments needed
 
-   if Infile_Name = null
+   if Infile.Name = null
      or else Outfile_Name = null
    then
       raise Usage_Error;
@@ -1111,11 +1141,11 @@ begin
    --  Open files and initialize preprocessing
 
    begin
-      Open (Infile,  In_File,  Infile_Name.all);
+      Open (Infile.File,  In_File,  Infile.Name.all);
 
    exception
       when Name_Error =>
-         Put_Line (Standard_Error, "cannot open " & Infile_Name.all);
+         Put_Line (Standard_Error, "cannot open " & Infile.Name.all);
          raise Fatal_Error;
    end;
 
@@ -1128,22 +1158,34 @@ begin
          raise Fatal_Error;
    end;
 
-   if Source_Ref_Pragma then
-      Put_Line
-        (Outfile, "pragma Source_Reference (1, """ & Infile_Name.all & """);");
-   end if;
-
-   Line_Num := 0;
-   Current_File_Name := Infile_Name;
+   Infile.Line_Num := 0;
+   Current_File_Name := Infile.Name;
 
    PP_Depth := 0;
    PP (0).Deleting := False;
 
+   --  We return here after we start reading an include file and after
+   --  we have finished reading an include file.
+
+   <<Read_In_File>>
+
+   --  If we generate Source_Reference pragmas, then generate one
+   --  either with line number 1 for a newly included file, or
+   --  with the number of the next line when we have returned to the
+   --  including file.
+
+   if Source_Ref_Pragma then
+      Put_Line
+        (Outfile, "pragma Source_Reference (" &
+           Image (Infile.Line_Num + 1) &
+           ", """ & Infile.Name.all & """);");
+   end if;
+
    --  Loop through lines in input file
 
-   while not End_Of_File (Infile) loop
-      Get_Line (Infile, Line_Buffer, Line_Length);
-      Line_Num := Line_Num + 1;
+   while not End_Of_File (Infile.File) loop
+      Get_Line (Infile.File, Line_Buffer, Line_Length);
+      Infile.Line_Num := Infile.Line_Num + 1;
 
       --  Handle preprocessor line
 
@@ -1152,6 +1194,112 @@ begin
 
          case K is
 
+            --  Include file
+
+            when K_Include =>
+               --  Ignore if Deleting is True
+
+               if PP (PP_Depth).Deleting then
+                  goto Output;
+               end if;
+
+               Skip_Spaces;
+
+               if Ptr >= Line_Length then
+                  Error ("no file to include");
+
+               elsif Line_Buffer (Ptr) /= '"' then
+                  Error
+                    ("file to include must be specified as a literal string");
+
+               else
+                  declare
+                     Start_File : constant Positive := Ptr + 1;
+
+                  begin
+                     Ptr := Line_Length;
+
+                     while Line_Buffer (Ptr) = ' '
+                       or else Line_Buffer (Ptr) = ASCII.HT
+                     loop
+                        Ptr := Ptr - 1;
+                     end loop;
+
+                     if Ptr <= Start_File
+                       or else Line_Buffer (Ptr) /= '"'
+                     then
+                        Error ("no string literal for included file");
+
+                     else
+                        if Infile.Next = null then
+                           Infile.Next := new Input;
+                           Infile.Next.Prev := Infile;
+                        end if;
+
+                        Infile := Infile.Next;
+                        Infile.Name :=
+                          new String'(Line_Buffer (Start_File .. Ptr - 1));
+
+                        --  Check for circularity: an file including itself,
+                        --  either directly or indirectly.
+
+                        declare
+                           File : Input_Ptr := Infile.Prev;
+
+                        begin
+                           while File /= null
+                             and then File.Name.all /= Infile.Name.all
+                           loop
+                              File := File.Prev;
+                           end loop;
+
+                           if File /= null then
+                              Infile := Infile.Prev;
+                              Error ("circularity in included files");
+
+                              while File.Prev /= null loop
+                                 File := File.Prev;
+                              end loop;
+
+                              while File /= Infile.Next loop
+                                 Error ('"' & File.Name.all &
+                                          """ includes """ &
+                                          File.Next.Name.all & '"');
+                                 File := File.Next;
+                              end loop;
+
+                           else
+                              --  We have a file name and no circularity.
+                              --  Open the file and record an error if the
+                              --  file cannot be opened.
+
+                              begin
+                                 Open (Infile.File, In_File, Infile.Name.all);
+                                 Current_File_Name := Infile.Name;
+                                 Infile.Line_Num := 0;
+
+                                 --  If we use Source_Reference pragma,
+                                 --  we need to output one for this new file.
+                                 goto Read_In_File;
+
+                              exception
+                                 when Name_Error =>
+
+                                    --  We need to set the input file to
+                                    --  the including file, so that the
+                                    --  line number is correct when reporting
+                                    --  the error.
+
+                                    Infile := Infile.Prev;
+                                    Error ("cannot open """ &
+                                             Infile.Next.Name.all & '"');
+                              end;
+                           end if;
+                        end;
+                     end if;
+                  end;
+               end if;
+
             --  If/Elsif processing
 
             when K_If | K_Elsif =>
@@ -1165,7 +1313,8 @@ begin
                if K = K_If then
                   PP_Depth := PP_Depth + 1;
                   PP (PP_Depth) :=
-                    (If_Line    => Line_Num,
+                    (If_Line    => Infile.Line_Num,
+                     If_Name    => Infile.Name,
                      Else_Line  => 0,
                      Deleting   => False,
                      Match_Seen => PP (PP_Depth - 1).Deleting);
@@ -1202,7 +1351,7 @@ begin
                           ")");
 
                else
-                  PP (PP_Depth).Else_Line := Line_Num;
+                  PP (PP_Depth).Else_Line := Infile.Line_Num;
                   PP (PP_Depth).Deleting := PP (PP_Depth).Match_Seen;
                end if;
 
@@ -1356,9 +1505,25 @@ begin
       end if;
    end loop;
 
+   --  If we have finished reading an included file, close it and continue
+   --  with the next line of the including file.
+
+   if Infile.Prev /= null then
+      Close (Infile.File);
+      Infile := Infile.Prev;
+      Current_File_Name := Infile.Name;
+      goto Read_In_File;
+   end if;
+
    for J in 1 .. PP_Depth loop
-      Error ("no matching #end for #if at line" &
-             Natural'Image (PP (J).If_Line));
+      if PP (J).If_Name = Infile.Name then
+         Error ("no matching #end for #if at line" &
+                Natural'Image (PP (J).If_Line));
+      else
+         Error ("no matching #end for #if at line" &
+                Natural'Image (PP (J).If_Line) &
+                " of file """ & PP (J).If_Name.all & '"');
+      end if;
    end loop;
 
    if Num_Errors = 0 then