diff options
| author | Yannick Moy <moy@adacore.com> | 2011-08-02 15:10:17 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-02 17:10:17 +0200 |
| commit | 2ba431e53edd2d06e5040a585454680990935d9d (patch) | |
| tree | 17782362e9211837a9f24856f0f7c0d5c803a897 /gcc/ada/restrict.adb | |
| parent | 0f85303509461f48131fcd3c34d1c159b6771dd1 (diff) | |
| download | gcc-2ba431e53edd2d06e5040a585454680990935d9d.zip gcc-2ba431e53edd2d06e5040a585454680990935d9d.tar.gz gcc-2ba431e53edd2d06e5040a585454680990935d9d.tar.bz2 | |
sem_aggr.adb, [...]: cleanup of SPARK mode
2011-08-02 Yannick Moy <moy@adacore.com>
* sem_aggr.adb, err_vars.ads, sem_ch3.adb, sem_ch5.adb, sem_ch9.adb,
debug.adb, sem_util.adb, sem_res.adb, sem_attr.adb, gnat1drv.adb,
errout.adb, errout.ads, exp_ch6.adb, sem_ch4.adb, restrict.adb,
restrict.ads, sem_ch6.adb, sem_ch8.adb, sem_ch11.adb,
opt.ads: cleanup of SPARK mode
From-SVN: r177175
Diffstat (limited to 'gcc/ada/restrict.adb')
| -rw-r--r-- | gcc/ada/restrict.adb | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gcc/ada/restrict.adb b/gcc/ada/restrict.adb index 883128a..c68475b 100644 --- a/gcc/ada/restrict.adb +++ b/gcc/ada/restrict.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -109,7 +109,7 @@ package body Restrict is -- Check_Formal_Restriction -- ------------------------------ - procedure Check_Formal_Restriction + procedure Check_SPARK_Restriction (Msg : String; N : Node_Id; Force : Boolean := False) @@ -129,11 +129,9 @@ package body Restrict is if Msg_Issued then Error_Msg_F ("\\| " & Msg, N); - elsif SPARK_Mode then - Error_Msg_F ("|~~" & Msg, N); end if; end if; - end Check_Formal_Restriction; + end Check_SPARK_Restriction; procedure Check_Formal_Restriction (Msg1, Msg2 : String; N : Node_Id) is Msg_Issued : Boolean; @@ -154,9 +152,6 @@ package body Restrict is if Msg_Issued then Error_Msg_F ("\\| " & Msg1, N); Error_Msg_F (Msg2, N); - elsif SPARK_Mode then - Error_Msg_F ("|~~" & Msg1, N); - Error_Msg_F (Msg2, N); end if; end if; end Check_Formal_Restriction; @@ -380,7 +375,7 @@ package body Restrict is -- No_Dispatch restriction is not set. if R = No_Dispatch then - Check_Formal_Restriction ("class-wide is not allowed", N); + Check_SPARK_Restriction ("class-wide is not allowed", N); end if; if UI_Is_In_Int_Range (V) then |