41intnam.ads, [...]: Merge in ACT changes.

	* 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]

From-SVN: r50451

1 files changed, 70 insertions, 30 deletions

diff --git a/gcc/ada/prj-strt.adb b/gcc/ada/prj-strt.adb
index 790c632..2a96cfd 100644
--- a/gcc/ada/prj-strt.adb
+++ b/gcc/ada/prj-strt.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.12 $
+--                            $Revision$
 --                                                                          --
---             Copyright (C) 2001 Free Software Foundation, Inc.            --
+--          Copyright (C) 2001-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- --
@@ -27,6 +27,7 @@
 ------------------------------------------------------------------------------
 
 with Errout;    use Errout;
+with Namet;     use Namet;
 with Prj.Attr;  use Prj.Attr;
 with Prj.Tree;  use Prj.Tree;
 with Scans;     use Scans;
@@ -37,8 +38,6 @@ with Types;     use Types;
 
 package body Prj.Strt is
 
-   Initial_Size : constant := 8;
-
    type Name_Location is record
       Name     : Name_Id := No_Name;
       Location : Source_Ptr := No_Location;
@@ -73,11 +72,6 @@ package body Prj.Strt is
    First_Choice_Node_Id : constant Choice_Node_Id :=
      Choice_Node_Low_Bound;
 
-   Empty_Choice : constant Choice_Node_Id :=
-     Choice_Node_Low_Bound;
-
-   First_Choice_Id : constant Choice_Node_Id := First_Choice_Node_Id + 1;
-
    package Choices is
       new Table.Table (Table_Component_Type => Choice_String,
                        Table_Index_Type     => Choice_Node_Id,
@@ -151,7 +145,7 @@ package body Prj.Strt is
    begin
       Reference :=  Default_Project_Node (Of_Kind => N_Attribute_Reference);
       Set_Location_Of (Reference, To => Token_Ptr);
-      Scan; -- past apostrophe
+      Scan; --  past apostrophe
       Expect (Tok_Identifier, "Identifier");
 
       if Token = Tok_Identifier then
@@ -165,15 +159,8 @@ package body Prj.Strt is
          end loop;
 
          if Current_Attribute = Empty_Attribute then
-            Error_Msg ("unknown attribute", Token_Ptr);
-            Reference := Empty_Node;
-
-         elsif
-           Attributes.Table (Current_Attribute).Kind_2 = Associative_Array
-         then
-            Error_Msg
-              ("associative array attribute cannot be referenced",
-               Token_Ptr);
+            Error_Msg_Name_1 := Token_Name;
+            Error_Msg ("unknown attribute %", Token_Ptr);
             Reference := Empty_Node;
 
          else
@@ -181,7 +168,30 @@ package body Prj.Strt is
             Set_Package_Node_Of (Reference, To => Current_Package);
             Set_Expression_Kind_Of
               (Reference, To => Attributes.Table (Current_Attribute).Kind_1);
+            Set_Case_Insensitive
+              (Reference, To => Attributes.Table (Current_Attribute).Kind_2 =
+                                          Case_Insensitive_Associative_Array);
             Scan;
+
+            if Attributes.Table (Current_Attribute).Kind_2 /= Single then
+               Expect (Tok_Left_Paren, "(");
+
+               if Token = Tok_Left_Paren then
+                  Scan;
+                  Expect (Tok_String_Literal, "literal string");
+
+                  if Token = Tok_String_Literal then
+                     Set_Associative_Array_Index_Of
+                       (Reference, To => Strval (Token_Node));
+                     Scan;
+                     Expect (Tok_Right_Paren, ")");
+
+                     if Token = Tok_Right_Paren then
+                        Scan;
+                     end if;
+                  end if;
+               end if;
+            end if;
          end if;
       end if;
    end Attribute_Reference;
@@ -319,7 +329,9 @@ package body Prj.Strt is
                Found := True;
 
                if Choices.Table (Choice).Already_Used then
-                  Error_Msg ("duplicate case label", Token_Ptr);
+                  String_To_Name_Buffer (Choice_String);
+                  Error_Msg_Name_1 := Name_Find;
+                  Error_Msg ("duplicate case label {", Token_Ptr);
                else
                   Choices.Table (Choice).Already_Used := True;
                end if;
@@ -329,7 +341,9 @@ package body Prj.Strt is
          end loop;
 
          if not Found then
-            Error_Msg ("illegal case label", Token_Ptr);
+            String_To_Name_Buffer (Choice_String);
+            Error_Msg_Name_1 := Name_Find;
+            Error_Msg ("illegal case label {", Token_Ptr);
          end if;
 
          Scan;
@@ -398,7 +412,9 @@ package body Prj.Strt is
          begin
             while Current /= Last_String loop
                if String_Equal (String_Value_Of (Current), String_Value) then
-                  Error_Msg ("duplicate value in type", Token_Ptr);
+                  String_To_Name_Buffer (String_Value);
+                  Error_Msg_Name_1 := Name_Find;
+                  Error_Msg ("duplicate value { in type", Token_Ptr);
                   exit;
                end if;
 
@@ -494,7 +510,8 @@ package body Prj.Strt is
                      end loop;
 
                      if The_Package = Empty_Node then
-                        Error_Msg ("package not yet defined",
+                        Error_Msg_Name_1 := The_Names (1).Name;
+                        Error_Msg ("package % not yet defined",
                                    The_Names (1).Location);
                      end if;
 
@@ -514,7 +531,8 @@ package body Prj.Strt is
                         if The_Project_Name_And_Node =
                                    Tree_Private_Part.No_Project_Name_And_Node
                         then
-                           Error_Msg ("unknown project",
+                           Error_Msg_Name_1 := The_Names (1).Name;
+                           Error_Msg ("unknown project %",
                                       The_Names (1).Location);
                         else
                            The_Project := The_Project_Name_And_Node.Node;
@@ -535,7 +553,8 @@ package body Prj.Strt is
                      end loop;
 
                      if With_Clause = Empty_Node then
-                        Error_Msg ("unknown project",
+                        Error_Msg_Name_1 := The_Names (1).Name;
+                        Error_Msg ("unknown project %",
                                    The_Names (1).Location);
                         The_Project := Empty_Node;
                         The_Package := Empty_Node;
@@ -551,7 +570,9 @@ package body Prj.Strt is
                         end loop;
 
                         if The_Package = Empty_Node then
-                           Error_Msg ("package not declared in project",
+                           Error_Msg_Name_1 := The_Names (2).Name;
+                           Error_Msg_Name_2 := The_Names (1).Name;
+                           Error_Msg ("package % not declared in project %",
                                       The_Names (2).Location);
                            First_Attribute := Attribute_First;
 
@@ -637,7 +658,8 @@ package body Prj.Strt is
                      end if;
 
                      if The_Project = Empty_Node then
-                        Error_Msg ("unknown package or project",
+                        Error_Msg_Name_1 := The_Names (1).Name;
+                        Error_Msg ("unknown package or project %",
                                    The_Names (1).Location);
                         Look_For_Variable := False;
                      else
@@ -675,7 +697,8 @@ package body Prj.Strt is
                   end if;
 
                   if The_Project = Empty_Node then
-                     Error_Msg ("unknown package or project",
+                     Error_Msg_Name_1 := The_Names (1).Name;
+                     Error_Msg ("unknown package or project %",
                                 The_Names (1).Location);
                      Look_For_Variable := False;
 
@@ -690,7 +713,8 @@ package body Prj.Strt is
                      end loop;
 
                      if The_Package = Empty_Node then
-                        Error_Msg ("unknown package",
+                        Error_Msg_Name_1 := The_Names (2).Name;
+                        Error_Msg ("unknown package %",
                                    The_Names (2).Location);
                         Look_For_Variable := False;
 
@@ -732,7 +756,8 @@ package body Prj.Strt is
          end if;
 
          if Current_Variable = Empty_Node then
-            Error_Msg ("unknown variable", The_Names (Last_Name).Location);
+            Error_Msg_Name_1 := Variable_Name;
+            Error_Msg ("unknown variable %", The_Names (Last_Name).Location);
          end if;
       end if;
 
@@ -745,6 +770,21 @@ package body Prj.Strt is
               (Variable, To => String_Type_Of (Current_Variable));
          end if;
       end if;
+
+      if Token = Tok_Left_Paren then
+         Error_Msg ("\variables cannot be associative arrays", Token_Ptr);
+         Scan;
+         Expect (Tok_String_Literal, "literal string");
+
+         if Token = Tok_String_Literal then
+            Scan;
+            Expect (Tok_Right_Paren, ")");
+
+            if Token = Tok_Right_Paren then
+               Scan;
+            end if;
+         end if;
+      end if;
    end Parse_Variable_Reference;
 
    ---------------------------------