* 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, 153 insertions, 61 deletions

diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb
index 35dace7a1bf..1a8bd23dc88 100644
--- a/gcc/ada/prj-proc.adb
+++ b/gcc/ada/prj-proc.adb
@@ -8,7 +8,7 @@
 --                                                                          --
 --                            $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- --
@@ -36,7 +36,7 @@ with Prj.Ext;  use Prj.Ext;
 with Prj.Nmsc; use Prj.Nmsc;
 with Stringt;  use Stringt;
 
-with GNAT.Case_Util;
+with GNAT.Case_Util; use GNAT.Case_Util;
 with GNAT.HTable;
 
 package body Prj.Proc is
@@ -76,13 +76,13 @@ package body Prj.Proc is
      (Project   : Project_Id;
       With_Name : Name_Id)
       return      Project_Id;
-   --  Find an imported or modified project of Project whose name is With_Name.
+   --  Find an imported or modified project of Project whose name is With_Name
 
    function Package_From
      (Project   : Project_Id;
       With_Name : Name_Id)
       return      Package_Id;
-   --  Find the package of Project whose name is With_Name.
+   --  Find the package of Project whose name is With_Name
 
    procedure Process_Declarative_Items
      (Project           : Project_Id;
@@ -105,15 +105,13 @@ package body Prj.Proc is
    --  Then process the declarative items of the project.
 
    procedure Check (Project : in out Project_Id);
-   --  Set all projects to not checked, then call Recursive_Check for
-   --  the main project Project.
-   --  Project is set to No_Project if errors occurred.
+   --  Set all projects to not checked, then call Recursive_Check for the
+   --  main project Project. Project is set to No_Project if errors occurred.
 
    procedure Recursive_Check (Project : Project_Id);
-   --  If Project is marked as not checked, mark it as checked,
-   --  call Check_Naming_Scheme for the project, then call itself
-   --  for a possible modified project and all the imported projects
-   --  of Project.
+   --  If Project is marked as not checked, mark it as checked, call
+   --  Check_Naming_Scheme for the project, then call itself for a
+   --  possible modified project and all the imported projects of Project.
 
    ---------
    -- Add --
@@ -204,7 +202,7 @@ package body Prj.Proc is
 
    procedure Check (Project : in out Project_Id) is
    begin
-      --  Make sure that all projects are marked as not checked.
+      --  Make sure that all projects are marked as not checked
 
       for Index in 1 .. Projects.Last loop
          Projects.Table (Index).Checked := False;
@@ -212,7 +210,7 @@ package body Prj.Proc is
 
       Recursive_Check (Project);
 
-      if Errout.Errors_Detected > 0 then
+      if Errout.Total_Errors_Detected > 0 then
          Project := No_Project;
       end if;
 
@@ -376,11 +374,12 @@ package body Prj.Proc is
                   The_Package     : Package_Id  := Pkg;
                   The_Name        : Name_Id     := No_Name;
                   The_Variable_Id : Variable_Id := No_Variable;
-                  The_Variable    : Variable;
+                  The_Variable    : Variable_Value;
                   Term_Project    : constant Project_Node_Id :=
                                       Project_Node_Of (The_Current_Term);
                   Term_Package    : constant Project_Node_Id :=
                                       Package_Node_Of (The_Current_Term);
+                  Index           : String_Id   := No_String;
 
                begin
                   if Term_Project /= Empty_Node and then
@@ -416,58 +415,146 @@ package body Prj.Proc is
 
                   The_Name := Name_Of (The_Current_Term);
 
-                  if The_Package /= No_Package then
+                  if Kind_Of (The_Current_Term) = N_Attribute_Reference then
+                     Index := Associative_Array_Index_Of (The_Current_Term);
+                  end if;
 
-                     --  First, if there is a package, look into the package
+                  --  If it is not an associative array attribute
 
-                     if Kind_Of (The_Current_Term) = N_Variable_Reference then
-                        The_Variable_Id :=
-                          Packages.Table (The_Package).Decl.Variables;
+                  if Index = No_String then
+
+                     --  It is not an associative array attribute
+
+                     if The_Package /= No_Package then
+
+                        --  First, if there is a package, look into the package
+
+                        if
+                          Kind_Of (The_Current_Term) = N_Variable_Reference
+                        then
+                           The_Variable_Id :=
+                             Packages.Table (The_Package).Decl.Variables;
+
+                        else
+                           The_Variable_Id :=
+                             Packages.Table (The_Package).Decl.Attributes;
+                        end if;
+
+                        while The_Variable_Id /= No_Variable
+                          and then
+                          Variable_Elements.Table (The_Variable_Id).Name /=
+                          The_Name
+                        loop
+                           The_Variable_Id :=
+                             Variable_Elements.Table (The_Variable_Id).Next;
+                        end loop;
 
-                     else
-                        The_Variable_Id :=
-                          Packages.Table (The_Package).Decl.Attributes;
                      end if;
 
-                     while The_Variable_Id /= No_Variable
-                       and then
-                         Variable_Elements.Table (The_Variable_Id).Name /=
-                                                                    The_Name
-                     loop
-                        The_Variable_Id :=
-                          Variable_Elements.Table (The_Variable_Id).Next;
-                     end loop;
+                     if The_Variable_Id = No_Variable then
 
-                  end if;
+                        --  If we have not found it, look into the project
 
-                  if The_Variable_Id = No_Variable then
+                        if
+                          Kind_Of (The_Current_Term) = N_Variable_Reference
+                        then
+                           The_Variable_Id :=
+                             Projects.Table (The_Project).Decl.Variables;
 
-                     --  If we have not found it, look into the project
+                        else
+                           The_Variable_Id :=
+                             Projects.Table (The_Project).Decl.Attributes;
+                        end if;
 
-                     if Kind_Of (The_Current_Term) = N_Variable_Reference then
-                        The_Variable_Id :=
-                          Projects.Table (The_Project).Decl.Variables;
+                        while The_Variable_Id /= No_Variable
+                          and then
+                          Variable_Elements.Table (The_Variable_Id).Name /=
+                          The_Name
+                        loop
+                           The_Variable_Id :=
+                             Variable_Elements.Table (The_Variable_Id).Next;
+                        end loop;
 
-                     else
-                        The_Variable_Id :=
-                          Projects.Table (The_Project).Decl.Attributes;
                      end if;
 
-                     while The_Variable_Id /= No_Variable
-                       and then
-                         Variable_Elements.Table (The_Variable_Id).Name /=
-                                                                     The_Name
-                     loop
-                        The_Variable_Id :=
-                          Variable_Elements.Table (The_Variable_Id).Next;
-                     end loop;
+                     pragma Assert (The_Variable_Id /= No_Variable,
+                                      "variable or attribute not found");
 
-                  end if;
+                     The_Variable := Variable_Elements.Table
+                                                    (The_Variable_Id).Value;
+
+                  else
 
-                  pragma Assert (The_Variable_Id /= No_Variable,
-                                 "variable or attribute not found");
+                     --  It is an associative array attribute
 
-                  The_Variable := Variable_Elements.Table (The_Variable_Id);
+                     declare
+                        The_Array   : Array_Id := No_Array;
+                        The_Element : Array_Element_Id := No_Array_Element;
+                        Array_Index : Name_Id := No_Name;
+                     begin
+                        if The_Package /= No_Package then
+                           The_Array :=
+                             Packages.Table (The_Package).Decl.Arrays;
+
+                        else
+                           The_Array :=
+                             Projects.Table (The_Project).Decl.Arrays;
+                        end if;
+
+                        while The_Array /= No_Array
+                          and then Arrays.Table (The_Array).Name /= The_Name
+                        loop
+                           The_Array := Arrays.Table (The_Array).Next;
+                        end loop;
+
+                        if The_Array /= No_Array then
+                           The_Element := Arrays.Table (The_Array).Value;
+
+                           String_To_Name_Buffer (Index);
+
+                           if Case_Insensitive (The_Current_Term) then
+                              To_Lower (Name_Buffer (1 .. Name_Len));
+                           end if;
+
+                           Array_Index := Name_Find;
+
+                           while The_Element /= No_Array_Element
+                             and then Array_Elements.Table (The_Element).Index
+                                                         /= Array_Index
+                           loop
+                              The_Element :=
+                                Array_Elements.Table (The_Element).Next;
+                           end loop;
+
+                        end if;
+
+                        if The_Element /= No_Array_Element then
+                           The_Variable :=
+                             Array_Elements.Table (The_Element).Value;
+
+                        else
+                           if
+                             Expression_Kind_Of (The_Current_Term) = List
+                           then
+                              The_Variable :=
+                                (Kind     => List,
+                                 Location => No_Location,
+                                 Default  => True,
+                                 Values   => Nil_String);
+
+                           else
+                              The_Variable :=
+                                (Kind     => Single,
+                                 Location => No_Location,
+                                 Default  => True,
+                                 Value    => Empty_String);
+                           end if;
+
+                        end if;
+
+                     end;
+
+                  end if;
 
                   case Kind is
 
@@ -480,13 +567,13 @@ package body Prj.Proc is
 
                      when Single =>
 
-                        case The_Variable.Value.Kind is
+                        case The_Variable.Kind is
 
                            when Undefined =>
                               null;
 
                            when Single =>
-                              Add (Result.Value, The_Variable.Value.Value);
+                              Add (Result.Value, The_Variable.Value);
 
                            when List =>
 
@@ -501,7 +588,7 @@ package body Prj.Proc is
                         end case;
 
                      when List =>
-                        case The_Variable.Value.Kind is
+                        case The_Variable.Kind is
 
                            when Undefined =>
                               null;
@@ -523,7 +610,7 @@ package body Prj.Proc is
 
                               Last := String_Elements.Last;
                               String_Elements.Table (Last) :=
-                                (Value    => The_Variable.Value.Value,
+                                (Value    => The_Variable.Value,
                                  Location => Location_Of (The_Current_Term),
                                  Next     => Nil_String);
 
@@ -531,7 +618,7 @@ package body Prj.Proc is
 
                               declare
                                  The_List : String_List_Id :=
-                                              The_Variable.Value.Values;
+                                              The_Variable.Values;
 
                               begin
                                  while The_List /= Nil_String loop
@@ -591,7 +678,8 @@ package body Prj.Proc is
                      else
                         Error_Report
                           ("""" & Get_Name_String (Name) &
-                           """ is an undefined external reference");
+                           """ is an undefined external reference",
+                           Project);
                      end if;
 
                      Value := Empty_String;
@@ -742,14 +830,13 @@ package body Prj.Proc is
          From_Project_Node => From_Project_Node,
          Modified_By       => No_Project);
 
-      if Errout.Errors_Detected > 0 then
+      if Errout.Total_Errors_Detected > 0 then
          Project := No_Project;
       end if;
 
       if Project /= No_Project then
          Check (Project);
       end if;
-
    end Process;
 
    -------------------------------
@@ -894,7 +981,8 @@ package body Prj.Proc is
                         else
                            Error_Report
                              ("no value defined for " &
-                              Get_Name_String (Error_Msg_Name_1));
+                              Get_Name_String (Error_Msg_Name_1),
+                              Project);
                         end if;
 
                      else
@@ -930,7 +1018,8 @@ package body Prj.Proc is
                                     Get_Name_String (Error_Msg_Name_1) &
                                     """ is illegal for typed string """ &
                                     Get_Name_String (Error_Msg_Name_2) &
-                                    """");
+                                    """",
+                                    Project);
                               end if;
                            end if;
                         end;
@@ -1301,11 +1390,14 @@ package body Prj.Proc is
             Projects.Increment_Last;
             Project := Projects.Last;
             Processed_Projects.Set (Name, Project);
+
             Processed_Data.Name        := Name;
             Processed_Data.Path_Name   := Path_Name_Of (From_Project_Node);
             Processed_Data.Location    := Location_Of (From_Project_Node);
             Processed_Data.Directory   := Directory_Of (From_Project_Node);
             Processed_Data.Modified_By := Modified_By;
+            Processed_Data.Naming      := Standard_Naming_Data;
+
             Add_Attributes (Processed_Data.Decl, Attribute_First);
             With_Clause := First_With_Clause_Of (From_Project_Node);