OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Implementation of AI12-0131: legality of class-wide precondition

Browse Source 
This patch refines the legality check on a class-wide precondition on a type
extension when ancestor does not have a class-wide precondition. Previously the
compiler accepted such a precondition when the ancestor had a class-wide
postcondition.

Compiling pck.ads must yield:

  pck.ads:7:04: illegal class-wide precondition on overriding operation

----
package Pck is
   type Parent is tagged null record;
   procedure Init (P : Parent) with Post'Class => True;

   type Child is new Parent with null record;
   overriding procedure Init (C : Child) with
   Pre'Class => True;
end Pck;

2018-05-23  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* sem_prag.adb (Inherit_Class_Wide_Pre): Refine legality check on
	class-wide precondition on a type extension when ancestor does not have
	a class-wide precondition.  Previously the compiler accepted such a
	precondition when the ancestor had a class-wide postcondition.

From-SVN: r260592
This commit is contained in:
Ed Schonberg 2018-05-23 10:23:29 +00:00 committed by Pierre-Marie de Rodat
parent 026733d84e
commit b30f86de98
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ada/ChangeLog
View File

@ -1,3 +1,10 @@
2018-05-23 Ed Schonberg <schonberg@adacore.com>
* sem_prag.adb (Inherit_Class_Wide_Pre): Refine legality check on
class-wide precondition on a type extension when ancestor does not have
a class-wide precondition. Previously the compiler accepted such a
precondition when the ancestor had a class-wide postcondition.
2018-05-23 Javier Miranda <miranda@adacore.com>
* sem_attr.adb (Valid_Scalars): Do not invoke Error_Attr_P to report

4
gcc/ada/sem_prag.adb
View File

@ -4444,7 +4444,9 @@ package body Sem_Prag is
if Present (Cont) then
Prag := Pre_Post_Conditions (Cont);
while Present (Prag) loop
if Class_Present (Prag) then
if Pragma_Name (Prag) = Name_Precondition
and then Class_Present (Prag)
then
return True;
end if;