diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-10-29 11:50:12 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-10-29 11:50:12 +0100 |
| commit | c607e6d50ef2dee78cdbf008f763c4098acb185a (patch) | |
| tree | 861c65e61bc492b4acbb8cde73e9386fecd5dbcd /gcc/ada | |
| parent | 9c79f208a3b8ba3c84f5ced0279a79f2cac0f50b (diff) | |
| download | gcc-c607e6d50ef2dee78cdbf008f763c4098acb185a.zip gcc-c607e6d50ef2dee78cdbf008f763c4098acb185a.tar.gz gcc-c607e6d50ef2dee78cdbf008f763c4098acb185a.tar.bz2 | |
[multiple changes]
2012-10-29 Arnaud Charlet <charlet@adacore.com>
* usage.adb: Update usage line for -gnatw.k.
2012-10-29 Yannick Moy <moy@adacore.com>
* sem_prag.adb: Code clean up.
From-SVN: r192924
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_prag.adb | 20 | ||||
| -rw-r--r-- | gcc/ada/usage.adb | 2 |
3 files changed, 22 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cf29ed3..d408c95 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2012-10-29 Arnaud Charlet <charlet@adacore.com> + + * usage.adb: Update usage line for -gnatw.k. + +2012-10-29 Yannick Moy <moy@adacore.com> + + * sem_prag.adb: Code clean up. + 2012-10-29 Vincent Celier <celier@adacore.com> * projects.texi: Clarify documentation of attribute diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 4af9a51..1b49eeb 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -6759,9 +6759,9 @@ package body Sem_Prag is end if; end Annotate; - ----------------------------- - -- Assert & Assert_And_Cut -- - ----------------------------- + --------------------------- + -- Assert/Assert_And_Cut -- + --------------------------- -- pragma Assert ([Check =>] Boolean_EXPRESSION -- [, [Message =>] Static_String_EXPRESSION]); @@ -6774,7 +6774,13 @@ package body Sem_Prag is Newa : List_Id; begin - Ada_2005_Pragma; + if Prag_Id = Pragma_Assert then + Ada_2005_Pragma; + + else -- Pragma_Assert_And_Cut + GNAT_Pragma; + end if; + Check_At_Least_N_Arguments (1); Check_At_Most_N_Arguments (2); Check_Arg_Order ((Name_Check, Name_Message)); @@ -13679,9 +13685,9 @@ package body Sem_Prag is end; end Stream_Convert; - ------------------------- - -- Style_Checks (GNAT) -- - ------------------------- + ------------------ + -- Style_Checks -- + ------------------ -- pragma Style_Checks (On | Off | ALL_CHECKS | STRING_LITERAL); diff --git a/gcc/ada/usage.adb b/gcc/ada/usage.adb index f5e0706..7c9c402 100644 --- a/gcc/ada/usage.adb +++ b/gcc/ada/usage.adb @@ -474,7 +474,7 @@ begin "(annex J) feature"); Write_Line (" k+ turn on warnings on constant variable"); Write_Line (" K* turn off warnings on constant variable"); - Write_Line (" .k+ turn on warnings for standard redefinition"); + Write_Line (" .k turn on warnings for standard redefinition"); Write_Line (" .K* turn off warnings for standard redefinition"); Write_Line (" l turn on warnings for missing " & "elaboration pragma"); |