diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-17 09:32:20 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-17 09:32:20 +0000 |
| commit | 4ad935a229b94c0fa7d1677b40dc29094b4b2085 (patch) | |
| tree | e2ae13596d1291a159e6037aadeb00aae5035555 /gcc/ada/sem_cat.adb | |
| parent | a050681322cb0bb78bfc0900406c132ede630f81 (diff) | |
| download | gcc-4ad935a229b94c0fa7d1677b40dc29094b4b2085.tar.gz | |
2010-06-17 Robert Dewar <dewar@adacore.com>
* back_end.adb, sem_res.adb, switch-c.adb, sem_scil.adb: Minor
reformatting.
* sem_attr.adb, sem_cat.adb, sem_disp.adb, sem_elab.adb, sem_elim.adb,
sem_eval.adb: Use Ekind_In
2010-06-17 Ed Schonberg <schonberg@adacore.com>
* sem_ch8.adb: better error message for illegal inherited discriminant
2010-06-17 Vincent Celier <celier@adacore.com>
* bindusg.adb: Remove lines for -A and -C
* gnat_ugn.texi: Remove all documentation and examples of switches -A
and -C for gnatbind and gnatlink.
* gnatlink.adb (Usage): Remove lines for -A and -C
* switch-b.adb (Scan_Binder_Switches): Issue warning when switch -C is
specified.
* gcc-interface/Make-lang.in: Update dependencies.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160891 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_cat.adb')
| -rw-r--r-- | gcc/ada/sem_cat.adb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb index c8d06e8cfec..fcab128e3c7 100644 --- a/gcc/ada/sem_cat.adb +++ b/gcc/ada/sem_cat.adb @@ -1397,8 +1397,8 @@ package body Sem_Cat is null; - elsif Ekind (Param_Type) = E_Anonymous_Access_Type - or else Ekind (Param_Type) = E_Anonymous_Access_Subprogram_Type + elsif Ekind_In (Param_Type, E_Anonymous_Access_Type, + E_Anonymous_Access_Subprogram_Type) then -- From RM E.2.2(14), no anonymous access parameter other than -- controlling ones may be used (because an anonymous access @@ -1454,9 +1454,9 @@ package body Sem_Cat is ("limited type not allowed in rci unit", Parent (E)); Explain_Limited_Type (E, Parent (E)); - elsif Ekind (E) = E_Generic_Function - or else Ekind (E) = E_Generic_Package - or else Ekind (E) = E_Generic_Procedure + elsif Ekind_In (E, E_Generic_Function, + E_Generic_Package, + E_Generic_Procedure) then Error_Msg_N ("generic declaration not allowed in rci unit", Parent (E)); @@ -1551,7 +1551,6 @@ package body Sem_Cat is Type_Decl := Parent (Param_Type); if Ekind (Param_Type) = E_Anonymous_Access_Type then - if K = N_Subprogram_Declaration then Error_Node := Param_Spec; end if; |