diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-14 13:32:14 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-14 13:32:14 +0000 |
| commit | 3755dbc5803218c7b66e96bf8330379c78cff9c6 (patch) | |
| tree | 8cd5f637a3983c187a4335bba34225ba77a08a2c /gcc/ada/par-ch6.adb | |
| parent | d1e3938c29a5adad649532a30a4c8f627ccc955a (diff) | |
| download | gcc-3755dbc5803218c7b66e96bf8330379c78cff9c6.tar.gz | |
2010-06-14 Sergey Rybin <rybin@adacore.com>
* gnat_ugn.texi: Add description of '-cargs gcc_switches' to gnatstub
and gnatppa.
2010-06-14 Thomas Quinot <quinot@adacore.com>
* exp_ch4.adb (Expand_Short_Circuit_Operator): New subprogram,
factoring duplicated code between...
(Expand_N_And_Than, Expand_N_Or_Else): Remove duplicated code.
* a-envvar.ads: Minor reformatting
2010-06-14 Arnaud Charlet <charlet@adacore.com>
* ali.adb, ali.ads, lib-xref.ads: Document new '+' letter for C/C++
static entities.
(Scan_ALI): Take into account new Visibility field.
(Visibility_Kind): New type.
(Xref_Entity_Record): Replace Lib field by Visibility.
* gcc-interface/Make-lang.in: Update dependencies.
2010-06-14 Pascal Obry <obry@adacore.com>
* raise.h: Remove unused defintions.
2010-06-14 Bob Duff <duff@adacore.com>
* par-ch10.adb (P_Subunit): If the next token after "separate(X)" is
Tok_Not or Tok_Overriding, call P_Subprogram. We had previously given
the incorrect error "proper body expected".
* par-ch6.adb (P_Subprogram): Suppress "overriding indicator not
allowed here" error in case of subunits, which was triggered by the
above change to P_Subunit.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160740 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/par-ch6.adb')
| -rw-r--r-- | gcc/ada/par-ch6.adb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb index ea5df6dfb3b..2916f53d162 100644 --- a/gcc/ada/par-ch6.adb +++ b/gcc/ada/par-ch6.adb @@ -215,14 +215,17 @@ package body Ch6 is -- already been given, so no need to give another message here. -- An overriding indicator is allowed for subprogram declarations, - -- bodies, renamings, stubs, and instantiations. The test against - -- Pf_Decl_Pbod is added to account for the case of subprograms - -- declared in a protected type, where only subprogram declarations - -- and bodies can occur. + -- bodies (including subunits), renamings, stubs, and + -- instantiations. The test against Pf_Decl_Pbod is added to account + -- for the case of subprograms declared in a protected type, where + -- only subprogram declarations and bodies can occur. The Pf_Pbod + -- case is for subunits. if Pf_Flags /= Pf_Decl_Gins_Pbod_Rnam_Stub and then Pf_Flags /= Pf_Decl_Pbod + and then + Pf_Flags /= Pf_Pbod then Error_Msg_SC ("overriding indicator not allowed here!"); |