[Ada] Use membership tests in front-end

gcc/ada/

	* aspects.adb, atree.adb, atree.ads, checks.adb, contracts.adb,
	einfo.adb, errout.adb, exp_aggr.adb, exp_attr.adb, exp_cg.adb,
	exp_ch11.adb, exp_ch2.adb, exp_ch3.adb, exp_ch4.adb,
	exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch8.adb, exp_ch9.adb,
	exp_dbug.adb, exp_disp.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_put_image.adb, exp_smem.adb, exp_tss.adb,
	exp_unst.adb, exp_util.adb, freeze.adb, ghost.adb, gnat1drv.adb,
	inline.adb, lib-writ.adb, lib-xref-spark_specific.adb,
	lib-xref.adb, namet.adb, namet.ads, nlists.adb, par-ch10.adb,
	par-ch2.adb, par-ch3.adb, par-ch4.adb, par-ch5.adb, par-ch6.adb,
	par-prag.adb, par-util.adb, par_sco.adb, pprint.adb,
	repinfo.adb, restrict.adb, rtsfind.adb, scil_ll.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_aux.adb, sem_cat.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch12.adb, sem_ch13.adb,
	sem_ch3.adb, sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch7.adb,
	sem_ch8.adb, sem_ch9.adb, sem_dim.adb, sem_disp.adb,
	sem_dist.adb, sem_elab.adb, sem_elim.adb, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_scil.adb, sem_type.adb, sem_util.adb, sem_warn.adb,
	sinfo.adb, sinfo.ads, sprint.adb, styleg.adb, tbuild.adb,
	treepr.adb (Nkind_In, Nam_In, Ekind_In): Removed, replaced by
	membership tests.

1 files changed, 0 insertions, 495 deletions

diff --git a/gcc/ada/atree.adb b/gcc/ada/atree.adb
index 1a00f59..7e05a48 100644
--- a/gcc/ada/atree.adb
+++ b/gcc/ada/atree.adb
@@ -994,336 +994,6 @@ package body Atree is
       return N_To_E (Nodes.Table (E + 1).Nkind);
    end Ekind;
 
-   --------------
-   -- Ekind_In --
-   --------------
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4 or else
-             T = V5;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4 or else
-             T = V5 or else
-             T = V6;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind;
-      V7 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4 or else
-             T = V5 or else
-             T = V6 or else
-             T = V7;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind;
-      V7 : Entity_Kind;
-      V8 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4 or else
-             T = V5 or else
-             T = V6 or else
-             T = V7 or else
-             T = V8;
-   end Ekind_In;
-
-   function Ekind_In
-     (T  : Entity_Kind;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind;
-      V7 : Entity_Kind;
-      V8 : Entity_Kind;
-      V9 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4 or else
-             T = V5 or else
-             T = V6 or else
-             T = V7 or else
-             T = V8 or else
-             T = V9;
-   end Ekind_In;
-
-   function Ekind_In
-     (T   : Entity_Kind;
-      V1  : Entity_Kind;
-      V2  : Entity_Kind;
-      V3  : Entity_Kind;
-      V4  : Entity_Kind;
-      V5  : Entity_Kind;
-      V6  : Entity_Kind;
-      V7  : Entity_Kind;
-      V8  : Entity_Kind;
-      V9  : Entity_Kind;
-      V10 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1 or else
-             T = V2 or else
-             T = V3 or else
-             T = V4 or else
-             T = V5 or else
-             T = V6 or else
-             T = V7 or else
-             T = V8 or else
-             T = V9 or else
-             T = V10;
-   end Ekind_In;
-
-   function Ekind_In
-     (T   : Entity_Kind;
-      V1  : Entity_Kind;
-      V2  : Entity_Kind;
-      V3  : Entity_Kind;
-      V4  : Entity_Kind;
-      V5  : Entity_Kind;
-      V6  : Entity_Kind;
-      V7  : Entity_Kind;
-      V8  : Entity_Kind;
-      V9  : Entity_Kind;
-      V10 : Entity_Kind;
-      V11 : Entity_Kind) return Boolean
-   is
-   begin
-      return T = V1  or else
-             T = V2  or else
-             T = V3  or else
-             T = V4  or else
-             T = V5  or else
-             T = V6  or else
-             T = V7  or else
-             T = V8  or else
-             T = V9  or else
-             T = V10 or else
-             T = V11;
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4, V5);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4, V5, V6);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind;
-      V7 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4, V5, V6, V7);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind;
-      V7 : Entity_Kind;
-      V8 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4, V5, V6, V7, V8);
-   end Ekind_In;
-
-   function Ekind_In
-     (E  : Entity_Id;
-      V1 : Entity_Kind;
-      V2 : Entity_Kind;
-      V3 : Entity_Kind;
-      V4 : Entity_Kind;
-      V5 : Entity_Kind;
-      V6 : Entity_Kind;
-      V7 : Entity_Kind;
-      V8 : Entity_Kind;
-      V9 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4, V5, V6, V7, V8, V9);
-   end Ekind_In;
-
-   function Ekind_In
-     (E   : Entity_Id;
-      V1  : Entity_Kind;
-      V2  : Entity_Kind;
-      V3  : Entity_Kind;
-      V4  : Entity_Kind;
-      V5  : Entity_Kind;
-      V6  : Entity_Kind;
-      V7  : Entity_Kind;
-      V8  : Entity_Kind;
-      V9  : Entity_Kind;
-      V10 : Entity_Kind) return Boolean
-   is
-   begin
-      return Ekind_In (Ekind (E), V1, V2, V3, V4, V5, V6, V7, V8, V9, V10);
-   end Ekind_In;
-
-   function Ekind_In
-     (E   : Entity_Id;
-      V1  : Entity_Kind;
-      V2  : Entity_Kind;
-      V3  : Entity_Kind;
-      V4  : Entity_Kind;
-      V5  : Entity_Kind;
-      V6  : Entity_Kind;
-      V7  : Entity_Kind;
-      V8  : Entity_Kind;
-      V9  : Entity_Kind;
-      V10 : Entity_Kind;
-      V11 : Entity_Kind) return Boolean
-   is
-   begin
-      return
-        Ekind_In (Ekind (E), V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11);
-   end Ekind_In;
-
    ------------------
    -- Error_Posted --
    ------------------
@@ -1783,171 +1453,6 @@ package body Atree is
       return Nodes.Table (N).Nkind;
    end Nkind;
 
-   --------------
-   -- Nkind_In --
-   --------------
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind;
-      V4 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind;
-      V4 : Node_Kind;
-      V5 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind;
-      V4 : Node_Kind;
-      V5 : Node_Kind;
-      V6 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind;
-      V4 : Node_Kind;
-      V5 : Node_Kind;
-      V6 : Node_Kind;
-      V7 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind;
-      V4 : Node_Kind;
-      V5 : Node_Kind;
-      V6 : Node_Kind;
-      V7 : Node_Kind;
-      V8 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7, V8);
-   end Nkind_In;
-
-   function Nkind_In
-     (N  : Node_Id;
-      V1 : Node_Kind;
-      V2 : Node_Kind;
-      V3 : Node_Kind;
-      V4 : Node_Kind;
-      V5 : Node_Kind;
-      V6 : Node_Kind;
-      V7 : Node_Kind;
-      V8 : Node_Kind;
-      V9 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7, V8, V9);
-   end Nkind_In;
-
-   function Nkind_In
-     (N   : Node_Id;
-      V1  : Node_Kind;
-      V2  : Node_Kind;
-      V3  : Node_Kind;
-      V4  : Node_Kind;
-      V5  : Node_Kind;
-      V6  : Node_Kind;
-      V7  : Node_Kind;
-      V8  : Node_Kind;
-      V9  : Node_Kind;
-      V10 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7, V8, V9, V10);
-   end Nkind_In;
-
-   function Nkind_In
-     (N   : Node_Id;
-      V1  : Node_Kind;
-      V2  : Node_Kind;
-      V3  : Node_Kind;
-      V4  : Node_Kind;
-      V5  : Node_Kind;
-      V6  : Node_Kind;
-      V7  : Node_Kind;
-      V8  : Node_Kind;
-      V9  : Node_Kind;
-      V10 : Node_Kind;
-      V11 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7, V8, V9, V10,
-                                  V11);
-   end Nkind_In;
-
-   function Nkind_In
-     (N   : Node_Id;
-      V1  : Node_Kind;
-      V2  : Node_Kind;
-      V3  : Node_Kind;
-      V4  : Node_Kind;
-      V5  : Node_Kind;
-      V6  : Node_Kind;
-      V7  : Node_Kind;
-      V8  : Node_Kind;
-      V9  : Node_Kind;
-      V10 : Node_Kind;
-      V11 : Node_Kind;
-      V12 : Node_Kind;
-      V13 : Node_Kind;
-      V14 : Node_Kind;
-      V15 : Node_Kind;
-      V16 : Node_Kind;
-      V17 : Node_Kind) return Boolean
-   is
-   begin
-      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7, V8, V9, V10,
-                                  V11, V12, V13, V14, V15, V16, V17);
-   end Nkind_In;
-
    --------
    -- No --
    --------