diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-09-10 17:12:42 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-09-10 17:12:42 +0200 |
| commit | 80e59506c2065fe2f4550644e0fbf2b585ab5be3 (patch) | |
| tree | 039c8844fa257a96041b0dabfdfdb9b94b398349 /gcc/ada/sem_ch6.adb | |
| parent | 4bb9c7b9ed2ddc21915fd41fcac2bd0b77609c7c (diff) | |
| download | gcc-80e59506c2065fe2f4550644e0fbf2b585ab5be3.zip gcc-80e59506c2065fe2f4550644e0fbf2b585ab5be3.tar.gz gcc-80e59506c2065fe2f4550644e0fbf2b585ab5be3.tar.bz2 | |
[multiple changes]
2013-09-10 Ed Schonberg <schonberg@adacore.com>
* sem_prag.adb (Analyze_Pragma, case SPARK_Mode): Handle properly
a subprogram body without previous spec.
2013-09-10 Gary Dismukes <dismukes@adacore.com>
* sem_ch4.adb: Minor typo fixes.
2013-09-10 Hristian Kirtchev <kirtchev@adacore.com>
* aspects.adb (Aspects_On_Body_OK): New routine.
* aspects.ads: Modify type Aspect_Expression to include
the Optional_XXX variants. Update the contents of
table Aspect_Argument. Add table Aspect_On_Body_OK.
(Aspects_On_Body_OK): New routine.
* par-ch13.adb (Get_Aspect_Specifications): Account for optional
names and expressions when parsing an aspect.
* sem_ch6.adb: Add with and use clause for Aspects.
(Analyze_Subprogram_Body_Helper): Do not emit an error when
analyzing a body with aspects that can be applied simultaneously
to both spec and body.
* sem_ch13.adb (Analyze_Aspect_Specifications): Insert the
corresponding pragma of an aspect that applies to a subprogram
body in the declarative part.
(Make_Aitem_Pragma): Do not generate a pragma with an empty argument
list.
From-SVN: r202462
Diffstat (limited to 'gcc/ada/sem_ch6.adb')
| -rw-r--r-- | gcc/ada/sem_ch6.adb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index e4ad78b..7913d36 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -23,6 +23,7 @@ -- -- ------------------------------------------------------------------------------ +with Aspects; use Aspects; with Atree; use Atree; with Checks; use Checks; with Debug; use Debug; @@ -2671,18 +2672,16 @@ package body Sem_Ch6 is end if; end if; - -- Ada 2012 aspects may appear in a subprogram body, but only if there - -- is no previous spec. Ditto for a subprogram stub that does not have - -- a corresponding spec, but for which there may also be a spec_id. + -- Language-defined aspects cannot appear in a subprogram body if the + -- corresponding spec already has aspects. Exception to this rule are + -- certain user-defined aspects. Aspects that apply to a body stub are + -- moved to the proper body. Do not emit an error in this case. if Has_Aspects (N) then - - -- Aspects that apply to a body stub are relocated to the proper - -- body. Do not emit an error in this case. - if Present (Spec_Id) and then Nkind (N) not in N_Body_Stub and then Nkind (Parent (N)) /= N_Subunit + and then not Aspects_On_Body_OK (N) then Error_Msg_N ("aspect specifications must appear in subprogram declaration", |