summaryrefslogtreecommitdiff
path: root/gcc/ada/opt.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-01 16:02:10 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2011-08-01 16:02:10 +0000
commitbd5dc4ecff8b81d9f2a9585286415fbf8a3835a0 (patch)
tree9504cb26aef222dd3a0b5ec060685188ffca9ba9 /gcc/ada/opt.adb
parent286f80f15a8727825fa0184f90dacd4c04d589f4 (diff)
downloadgcc-bd5dc4ecff8b81d9f2a9585286415fbf8a3835a0.tar.gz
2011-08-01 Yannick Moy <moy@adacore.com>
* err_vars.ads (Error_Msg_Lang, Error_Msg_Langlen): new variables for insertion character ~~ * errout.ads, errout.adb (Formal_Error_Msg_...): remove procedures (Set_Error_Msg_Lang): new procedure which fixes the language for use with insertion character ~~ (Set_Msg_Text): treat insertion character ~~ * par-ch4.adb, par-ch5.adb, par-endh.adb, sem_attr.adb, sem_ch11.adb, sem_ch3.adb, sem_ch5.adb, sem_ch9.adb, sem_util.adb: Replace calls to Formal_Error_Msg_... procedures by equivalent Error_Msg_... procedures. Favor calls to Error_Msg_F(E) over Error_Msg_N(E). Make errors related to the formal language restriction not serious (insertion character |). * par.adb (Par): set formal language for error messages if needed * sem_ch6.adb (Check_Missing_Return): take into account possible generated statements at the end of the function * snames.ads-tmpl (Name_SPARK_95, Pragma_SPARK_95): new variable and enumeration value to define a new pragma SPARK_95 * opt.ads, opt.adb (SPARK_Version_Type, SPARK_Version_Default, SPARK_Version): new type and variables to store the SPARK version (none by default). (SPARK_Mode): return True when SPARK_Version is set * par-prag.adb: Correct indentation (Prag): take Pragma_SPARK_95 into account * sem_prag.adb (Set_Mechanism_Value, Sig_Flags): take Pragma_SPARK_95 into account. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177056 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/opt.adb')
-rw-r--r--gcc/ada/opt.adb6
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ada/opt.adb b/gcc/ada/opt.adb
index cb03ef51ecd..1e7bf0f709e 100644
--- a/gcc/ada/opt.adb
+++ b/gcc/ada/opt.adb
@@ -263,7 +263,11 @@ package body Opt is
function SPARK_Mode return Boolean is
begin
- return Debug.Debug_Flag_Dot_DD;
+ -- When dropping the debug flag in favor of a compiler option,
+ -- the option should implicitly set the SPARK_Version, so that this test
+ -- becomes simply SPARK_Version > SPARK_None.
+
+ return Debug.Debug_Flag_Dot_DD or else SPARK_Version > SPARK_None;
end SPARK_Mode;
---------------