* 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, 91 insertions, 55 deletions

diff --git a/gcc/ada/prj-dect.adb b/gcc/ada/prj-dect.adb
index 55bfb44bdb1..ff6591fd8bd 100644
--- a/gcc/ada/prj-dect.adb
+++ b/gcc/ada/prj-dect.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- --
@@ -26,17 +26,19 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Errout;     use Errout;
-with Prj.Strt;
-with Prj.Tree;   use Prj.Tree;
-with Scans;      use Scans;
-with Sinfo;      use Sinfo;
-with Types;      use Types;
-with Prj.Attr;   use Prj.Attr;
+with Errout;   use Errout;
+with Namet;    use Namet;
+with Prj.Strt; use Prj.Strt;
+with Prj.Tree; use Prj.Tree;
+with Scans;    use Scans;
+with Sinfo;    use Sinfo;
+with Types;    use Types;
+with Prj.Attr; use Prj.Attr;
 
 package body Prj.Dect is
 
    type Zone is (In_Project, In_Package, In_Case_Construction);
+   --  Needs a comment ???
 
    procedure Parse_Attribute_Declaration
      (Attribute         : out Project_Node_Id;
@@ -67,16 +69,14 @@ package body Prj.Dect is
    --  Parse a package declaration
 
    procedure Parse_String_Type_Declaration
-     (String_Type       : out Project_Node_Id;
-      Current_Project   : Project_Node_Id;
-      First_Attribute   : Attribute_Node_Id);
+     (String_Type     : out Project_Node_Id;
+      Current_Project : Project_Node_Id);
    --  type <name> is ( <literal_string> { , <literal_string> } ) ;
 
    procedure Parse_Variable_Declaration
-     (Variable          : out Project_Node_Id;
-      First_Attribute   : Attribute_Node_Id;
-      Current_Project   : Project_Node_Id;
-      Current_Package   : Project_Node_Id);
+     (Variable        : out Project_Node_Id;
+      Current_Project : Project_Node_Id;
+      Current_Package : Project_Node_Id);
    --  Parse a variable assignment
    --  <variable_Name> := <expression>; OR
    --  <variable_Name> : <string_type_Name> := <string_expression>;
@@ -96,6 +96,7 @@ package body Prj.Dect is
       Declarations := Default_Project_Node (Of_Kind => N_Project_Declaration);
       Set_Location_Of (Declarations, To => Token_Ptr);
       Set_Modified_Project_Of (Declarations, To => Extends);
+      Set_Project_Declaration_Of (Current_Project, Declarations);
       Parse_Declarative_Items
         (Declarations    => First_Declarative_Item,
          In_Zone         => In_Project,
@@ -132,12 +133,6 @@ package body Prj.Dect is
          Set_Name_Of (Attribute, To => Token_Name);
          Set_Location_Of (Attribute, To => Token_Ptr);
 
-         if Attributes.Table (Current_Attribute).Kind_2 =
-                            Case_Insensitive_Associative_Array
-         then
-            Set_Case_Insensitive (Attribute, To => True);
-         end if;
-
          while Current_Attribute /= Empty_Attribute
            and then
              Attributes.Table (Current_Attribute).Name /= Token_Name
@@ -146,7 +141,15 @@ package body Prj.Dect is
          end loop;
 
          if Current_Attribute = Empty_Attribute then
-            Error_Msg ("undefined attribute", Token_Ptr);
+            Error_Msg ("undefined attribute """ &
+                       Get_Name_String (Name_Of (Attribute)) &
+                       """",
+                       Token_Ptr);
+
+         elsif Attributes.Table (Current_Attribute).Kind_2 =
+                            Case_Insensitive_Associative_Array
+         then
+            Set_Case_Insensitive (Attribute, To => True);
          end if;
 
          Scan;
@@ -156,7 +159,10 @@ package body Prj.Dect is
          if Current_Attribute /= Empty_Attribute
            and then Attributes.Table (Current_Attribute).Kind_2 = Single
          then
-            Error_Msg ("this attribute cannot be an associative array",
+            Error_Msg ("the attribute """ &
+                       Get_Name_String
+                          (Attributes.Table (Current_Attribute).Name) &
+                       """ cannot be an associative array",
                        Location_Of (Attribute));
          end if;
 
@@ -179,7 +185,10 @@ package body Prj.Dect is
            and then
              Attributes.Table (Current_Attribute).Kind_2 /= Single
          then
-            Error_Msg ("this attribute need to be an associative array",
+            Error_Msg ("the attribute """ &
+                       Get_Name_String
+                          (Attributes.Table (Current_Attribute).Name) &
+                       """ needs to be an associative array",
                        Location_Of (Attribute));
          end if;
       end if;
@@ -199,7 +208,7 @@ package body Prj.Dect is
             Expression          : Project_Node_Id     := Empty_Node;
 
          begin
-            Prj.Strt.Parse_Expression
+            Parse_Expression
               (Expression      => Expression,
                Current_Project => Current_Project,
                Current_Package => Current_Package);
@@ -211,7 +220,10 @@ package body Prj.Dect is
                                           Expression_Kind_Of (Expression)
             then
                Error_Msg
-                 ("wrong expression kind for the attribute",
+                 ("wrong expression kind for attribute """ &
+                  Get_Name_String
+                    (Attributes.Table (Current_Attribute).Name) &
+                  """",
                   Expression_Location);
             end if;
          end;
@@ -229,19 +241,19 @@ package body Prj.Dect is
       Current_Project   : Project_Node_Id;
       Current_Package   : Project_Node_Id)
    is
-      Current_Item      : Project_Node_Id := Empty_Node;
-      Next_Item         : Project_Node_Id := Empty_Node;
-      First_Case_Item   : Boolean := True;
+      Current_Item    : Project_Node_Id := Empty_Node;
+      Next_Item       : Project_Node_Id := Empty_Node;
+      First_Case_Item : Boolean := True;
 
       Variable_Location : Source_Ptr := No_Location;
 
-      String_Type       : Project_Node_Id := Empty_Node;
+      String_Type : Project_Node_Id := Empty_Node;
 
-      Case_Variable     : Project_Node_Id := Empty_Node;
+      Case_Variable : Project_Node_Id := Empty_Node;
 
       First_Declarative_Item : Project_Node_Id := Empty_Node;
 
-      First_Choice      : Project_Node_Id := Empty_Node;
+      First_Choice : Project_Node_Id := Empty_Node;
 
    begin
       Case_Construction  :=
@@ -258,7 +270,7 @@ package body Prj.Dect is
 
       if Token = Tok_Identifier then
          Variable_Location := Token_Ptr;
-         Prj.Strt.Parse_Variable_Reference
+         Parse_Variable_Reference
            (Variable        => Case_Variable,
             Current_Project => Current_Project,
             Current_Package => Current_Package);
@@ -275,7 +287,10 @@ package body Prj.Dect is
          String_Type := String_Type_Of (Case_Variable);
 
          if String_Type = Empty_Node then
-            Error_Msg ("this variable is not typed", Variable_Location);
+            Error_Msg ("variable """ &
+                       Get_Name_String (Name_Of (Case_Variable)) &
+                       """ is not typed",
+                       Variable_Location);
          end if;
       end if;
 
@@ -288,7 +303,7 @@ package body Prj.Dect is
          Scan;
       end if;
 
-      Prj.Strt.Start_New_Case_Construction (String_Type);
+      Start_New_Case_Construction (String_Type);
 
       When_Loop :
 
@@ -339,7 +354,7 @@ package body Prj.Dect is
             exit When_Loop;
 
          else
-            Prj.Strt.Parse_Choice_List (First_Choice => First_Choice);
+            Parse_Choice_List (First_Choice => First_Choice);
             Set_First_Choice_Of (Current_Item, To => First_Choice);
 
             Expect (Tok_Arrow, "=>");
@@ -357,7 +372,7 @@ package body Prj.Dect is
          end if;
       end loop When_Loop;
 
-      Prj.Strt.End_Case_Construction;
+      End_Case_Construction;
 
       Expect (Tok_End, "end case");
 
@@ -417,7 +432,6 @@ package body Prj.Dect is
 
                Parse_Variable_Declaration
                  (Current_Declaration,
-                  First_Attribute => First_Attribute,
                   Current_Project => Current_Project,
                   Current_Package => Current_Package);
 
@@ -452,8 +466,7 @@ package body Prj.Dect is
 
                Parse_String_Type_Declaration
                  (String_Type     => Current_Declaration,
-                  Current_Project => Current_Project,
-                  First_Attribute => First_Attribute);
+                  Current_Project => Current_Project);
 
             when Tok_Case =>
 
@@ -535,7 +548,10 @@ package body Prj.Dect is
          end loop;
 
          if Current_Package  = Empty_Package then
-            Error_Msg ("not an allowed package name", Token_Ptr);
+            Error_Msg ("""" &
+                       Get_Name_String (Name_Of (Package_Declaration)) &
+                       """ is not an allowed package name",
+                       Token_Ptr);
 
          else
             Set_Package_Id_Of (Package_Declaration, To => Current_Package);
@@ -552,7 +568,10 @@ package body Prj.Dect is
 
                if Current /= Empty_Node then
                   Error_Msg
-                    ("package declared twice in the same project", Token_Ptr);
+                    ("package """ &
+                     Get_Name_String (Name_Of (Package_Declaration)) &
+                     """ is declared twice in the same project",
+                     Token_Ptr);
 
                else
                   --  Add the package to the project list
@@ -569,11 +588,12 @@ package body Prj.Dect is
          --  Scan past the package name
 
          Scan;
-
       end if;
 
       if Token = Tok_Renames then
+
          --  Scan past "renames"
+
          Scan;
 
          Expect (Tok_Identifier, "identifier");
@@ -593,7 +613,9 @@ package body Prj.Dect is
                end loop;
 
                if Clause = Empty_Node then
-                  Error_Msg ("not an imported project", Token_Ptr);
+                  Error_Msg ("""" &
+                             Get_Name_String (Project_Name) &
+                             """ is not an imported project", Token_Ptr);
                else
                   Set_Project_Of_Renamed_Package_Of
                     (Package_Declaration, To => The_Project);
@@ -629,7 +651,9 @@ package body Prj.Dect is
 
                         if Current = Empty_Node then
                            Error_Msg
-                             ("not a package declared by the project",
+                             ("""" &
+                              Get_Name_String (Token_Name) &
+                              """ is not a package declared by the project",
                               Token_Ptr);
                         end if;
                      end;
@@ -696,8 +720,7 @@ package body Prj.Dect is
 
    procedure Parse_String_Type_Declaration
      (String_Type     : out Project_Node_Id;
-      Current_Project : Project_Node_Id;
-      First_Attribute : Attribute_Node_Id)
+      Current_Project : Project_Node_Id)
    is
       Current      : Project_Node_Id := Empty_Node;
       First_String : Project_Node_Id := Empty_Node;
@@ -726,7 +749,10 @@ package body Prj.Dect is
          end loop;
 
          if Current /= Empty_Node then
-            Error_Msg ("duplicate string type name", Token_Ptr);
+            Error_Msg ("duplicate string type name """ &
+                       Get_Name_String (Token_Name) &
+                       """",
+                       Token_Ptr);
          else
             Current := First_Variable_Of (Current_Project);
             while Current /= Empty_Node
@@ -736,7 +762,9 @@ package body Prj.Dect is
             end loop;
 
             if Current /= Empty_Node then
-               Error_Msg ("already a variable name", Token_Ptr);
+               Error_Msg ("""" &
+                          Get_Name_String (Token_Name) &
+                          """ is already a variable name", Token_Ptr);
             else
                Set_Next_String_Type
                  (String_Type, To => First_String_Type_Of (Current_Project));
@@ -761,7 +789,7 @@ package body Prj.Dect is
          Scan;
       end if;
 
-      Prj.Strt.Parse_String_Type_List (First_String => First_String);
+      Parse_String_Type_List (First_String => First_String);
       Set_First_Literal_String (String_Type, To => First_String);
 
       Expect (Tok_Right_Paren, ")");
@@ -778,7 +806,6 @@ package body Prj.Dect is
 
    procedure Parse_Variable_Declaration
      (Variable        : out Project_Node_Id;
-      First_Attribute : Attribute_Node_Id;
       Current_Project : Project_Node_Id;
       Current_Package : Project_Node_Id)
    is
@@ -850,7 +877,11 @@ package body Prj.Dect is
                         if The_Project_Name_And_Node =
                           Tree_Private_Part.No_Project_Name_And_Node
                         then
-                           Error_Msg ("unknown project", Project_Location);
+                           Error_Msg ("unknown project """ &
+                                      Get_Name_String
+                                         (Project_String_Type_Name) &
+                                      """",
+                                      Project_Location);
                            Current := Empty_Node;
                         else
                            Current :=
@@ -867,7 +898,10 @@ package body Prj.Dect is
                   end loop;
 
                   if Current = Empty_Node then
-                     Error_Msg ("unknown string type", Type_Location);
+                     Error_Msg ("unknown string type """ &
+                                Get_Name_String (String_Type_Name) &
+                                """",
+                                Type_Location);
                   else
                      Set_String_Type_Of
                        (Variable, To => Current);
@@ -887,7 +921,7 @@ package body Prj.Dect is
 
       Expression_Location := Token_Ptr;
 
-      Prj.Strt.Parse_Expression
+      Parse_Expression
         (Expression      => Expression,
          Current_Project => Current_Project,
          Current_Package => Current_Package);
@@ -936,7 +970,9 @@ package body Prj.Dect is
                   if Expression_Kind_Of (The_Variable) /=
                                                  Expression_Kind_Of (Variable)
                   then
-                     Error_Msg ("wrong expression kind for the variable",
+                     Error_Msg ("wrong expression kind for variable """ &
+                                Get_Name_String (Name_Of (The_Variable)) &
+                                """",
                                 Expression_Location);
                   end if;
                end if;