diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-05-22 12:15:47 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-05-22 12:15:47 +0200 |
| commit | 30fc80cfa6546ffd5b3e5e1fe0679a8279476f4e (patch) | |
| tree | 917c22a54ca9a5c3042168e6256a194ad085ae21 | |
| parent | 90d6b7bc3a61e77363377ef6e5dfc71cf8ecff71 (diff) | |
| download | gcc-30fc80cfa6546ffd5b3e5e1fe0679a8279476f4e.zip gcc-30fc80cfa6546ffd5b3e5e1fe0679a8279476f4e.tar.gz gcc-30fc80cfa6546ffd5b3e5e1fe0679a8279476f4e.tar.bz2 | |
[multiple changes]
2015-05-22 Ed Schonberg <schonberg@adacore.com>
* sem_ch13.adb: Minor reformatting.
2015-05-22 Jose Ruiz <ruiz@adacore.com>
* a-reatim.adb: Minor change, fix typo.
From-SVN: r223533
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/a-reatim.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 13 |
3 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 8f1acdb..7e59e55 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2015-05-22 Ed Schonberg <schonberg@adacore.com> + + * sem_ch13.adb: Minor reformatting. + +2015-05-22 Jose Ruiz <ruiz@adacore.com> + + * a-reatim.adb: Minor change, fix typo. + 2015-05-22 Robert Dewar <dewar@adacore.com> * sem_util.ads: Minor addition of ??? comment. diff --git a/gcc/ada/a-reatim.adb b/gcc/ada/a-reatim.adb index c259e81..1b4d4d8 100644 --- a/gcc/ada/a-reatim.adb +++ b/gcc/ada/a-reatim.adb @@ -330,7 +330,7 @@ package body Ada.Real_Time is Out_Of_Range; end if; - -- Same for negative values of seconds, fundge up and check low bound + -- Same for negative values of seconds, fudge up and check low bound else Fudged_Result := Duration (Result_SC + Fudge) + TS_Fraction; diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index edb1c79..eb2c095 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -3893,8 +3893,8 @@ package body Sem_Ch13 is ("indexing function must have at least two parameters"); return; - -- For a derived type, check that no indexing aspect is - -- specified for the type if it is also inherited + -- For a derived type, check that no indexing aspect is specified + -- for the type if it is also inherited elsif Is_Derived_Type (Ent) then declare @@ -3904,8 +3904,7 @@ package body Sem_Ch13 is if Attr = Name_Constant_Indexing then Inherited := Find_Aspect (Etype (Ent), Aspect_Constant_Indexing); - - elsif Attr = Name_Variable_Indexing then + else pragma Assert (Attr = Name_Variable_Indexing); Inherited := Find_Aspect (Etype (Ent), Aspect_Variable_Indexing); end if; @@ -3914,15 +3913,15 @@ package body Sem_Ch13 is if Debug_Flag_Dot_XX then null; - -- Indicate the operation that must be overridden, - -- rather than redefining the indexing aspect + -- Indicate the operation that must be overridden, rather + -- than redefining the indexing aspect else Illegal_Indexing ("indexing function already inherited " & "from parent type"); Error_Msg_NE - ("!override& instead", + ("!override & instead", N, Entity (Expression (Inherited))); return; end if; |