aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/sem_disp.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2009-04-20 10:55:51 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2009-04-20 10:55:51 +0200
commitd7f9440126bb66732dced069c6cc61ea136c1f57 (patch)
treed3d43f7a558b700ce77e85a82786d8e77509880d /gcc/ada/sem_disp.adb
parentf8b86c2d808dadbb9143adacc1b0c162dbf58e1a (diff)
downloadgcc-d7f9440126bb66732dced069c6cc61ea136c1f57.zip
gcc-d7f9440126bb66732dced069c6cc61ea136c1f57.tar.gz
gcc-d7f9440126bb66732dced069c6cc61ea136c1f57.tar.bz2
[multiple changes]
2009-04-20 Bob Duff <duff@adacore.com> * rtsfind.adb: Minor comment fix 2009-04-20 Robert Dewar <dewar@adacore.com> * exp_aggr.adb: Minor reformatting Minor code reorganization (use Nkind_In) * g-socket.adb: Minor reformatting * g-socket.ads: Minor comment fix * s-auxdec.ads: Minor comment and organization update. * s-auxdec-vms_64.ads: Minor comment and organization update. * sem_ch10.adb: Minor addition of ??? comment * sem_disp.adb: Minor reformatting From-SVN: r146375
Diffstat (limited to 'gcc/ada/sem_disp.adb')
-rw-r--r--gcc/ada/sem_disp.adb15
1 files changed, 7 insertions, 8 deletions
diff --git a/gcc/ada/sem_disp.adb b/gcc/ada/sem_disp.adb
index d6799bc..44ec9c3 100644
--- a/gcc/ada/sem_disp.adb
+++ b/gcc/ada/sem_disp.adb
@@ -739,8 +739,8 @@ package body Sem_Disp is
then
pragma Assert
((Ekind (Subp) = E_Function
- and then Is_Dispatching_Operation (Old_Subp)
- and then Is_Null_Extension (Base_Type (Etype (Subp))))
+ and then Is_Dispatching_Operation (Old_Subp)
+ and then Is_Null_Extension (Base_Type (Etype (Subp))))
or else Get_TSS_Name (Subp) = TSS_Stream_Read
or else Get_TSS_Name (Subp) = TSS_Stream_Write);
@@ -769,12 +769,11 @@ package body Sem_Disp is
null;
-- If the type is already frozen, the overriding is not allowed
- -- except when Old_Subp is not a dispatching operation (which
- -- can occur when Old_Subp was inherited by an untagged type).
- -- However, a body with no previous spec freezes the type "after"
- -- its declaration, and therefore is a legal overriding (unless
- -- the type has already been frozen). Only the first such body
- -- is legal.
+ -- except when Old_Subp is not a dispatching operation (which can
+ -- occur when Old_Subp was inherited by an untagged type). However,
+ -- a body with no previous spec freezes the type "after" its
+ -- declaration, and therefore is a legal overriding (unless the type
+ -- has already been frozen). Only the first such body is legal.
elsif Present (Old_Subp)
and then Is_Dispatching_Operation (Old_Subp)