diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-26 10:49:18 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-26 10:49:18 +0000 |
commit | 8d8194a6d88ed4e451d57a190dbba6ec1f4517a2 (patch) | |
tree | 529389619f9f210e3855bc6754e7da9d1ceb16f7 /gcc/ada/ghost.adb | |
parent | f9e26ff7a87b8f3ec67d26f35c03c031e73947ba (diff) | |
download | gcc-8d8194a6d88ed4e451d57a190dbba6ec1f4517a2.tar.gz |
2015-05-26 Robert Dewar <dewar@adacore.com>
* exp_prag.adb, sem_ch3.adb, sem_ch5.adb, exp_ch11.adb, ghost.adb,
exp_ch6.adb, sem_ch6.adb, sem_ch8.adb, sem_ch11.adb, sem_ch13.adb,
exp_ch3.adb: Minor reformatting.
2015-05-26 Bob Duff <duff@adacore.com>
* treepr.adb: Minor improvement to debugging routines (pp, pn)
robustness. Rearrange the code so passing a nonexistent Node_Id
prints "No such node" rather than crashing, and causing gdb to
generate confusing messages.
2015-05-26 Gary Dismukes <dismukes@adacore.com>
* sem_util.adb: Minor typo fix.
2015-05-26 Yannick Moy <moy@adacore.com>
* sem_aux.adb (Subprogram_Body_Entity): Deal with subprogram stubs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223685 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/ghost.adb')
-rw-r--r-- | gcc/ada/ghost.adb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gcc/ada/ghost.adb b/gcc/ada/ghost.adb index 75ceb4b2b58..05295a0e3c3 100644 --- a/gcc/ada/ghost.adb +++ b/gcc/ada/ghost.adb @@ -121,18 +121,18 @@ package body Ghost is Error_Msg_N ("incompatible ghost policies in effect", Partial_View); Error_Msg_N ("\& declared with ghost policy `Check`", Partial_View); - Error_Msg_N - ("\& completed # with ghost policy `Ignore`", Partial_View); + Error_Msg_N ("\& completed # with ghost policy `Ignore`", + Partial_View); elsif Is_Ignored_Ghost_Entity (Partial_View) and then Policy = Name_Check then Error_Msg_Sloc := Sloc (Full_View); - Error_Msg_N ("incompatible ghost policies in effect", Partial_View); + Error_Msg_N ("incompatible ghost policies in effect", Partial_View); Error_Msg_N ("\& declared with ghost policy `Ignore`", Partial_View); - Error_Msg_N - ("\& completed # with ghost policy `Check`", Partial_View); + Error_Msg_N ("\& completed # with ghost policy `Check`", + Partial_View); end if; end Check_Ghost_Completion; @@ -300,7 +300,8 @@ package body Ghost is if GP = Name_Ignore and then AP /= Name_Ignore then Error_Msg_N - ("incompatible ghost policies in effect", Ghost_Ref); + ("incompatible ghost policies in effect", + Ghost_Ref); Error_Msg_NE ("\ghost entity & has policy `Ignore`", Ghost_Ref, Ghost_Id); @@ -494,14 +495,14 @@ package body Ghost is Error_Msg_N ("incompatible ghost policies in effect", Err_N); Error_Msg_NE ("\& declared with ghost policy `Check`", Err_N, Id); - Error_Msg_NE ("\& used # with ghost policy `Ignore`", Err_N, Id); + Error_Msg_NE ("\& used # with ghost policy `Ignore`", Err_N, Id); elsif Is_Ignored_Ghost_Entity (Id) and then Policy = Name_Check then Error_Msg_Sloc := Sloc (Err_N); - Error_Msg_N ("incompatible ghost policies in effect", Err_N); + Error_Msg_N ("incompatible ghost policies in effect", Err_N); Error_Msg_NE ("\& declared with ghost policy `Ignore`", Err_N, Id); - Error_Msg_NE ("\& used # with ghost policy `Check`", Err_N, Id); + Error_Msg_NE ("\& used # with ghost policy `Check`", Err_N, Id); end if; end Check_Ghost_Policy; @@ -558,7 +559,7 @@ package body Ghost is if not Is_Ghost_Entity (Iface) then Error_Msg_N ("type extension & cannot be ghost", Typ); - Error_Msg_NE ("\interface type & is not ghost", Typ, Iface); + Error_Msg_NE ("\interface type & is not ghost", Typ, Iface); return; end if; @@ -587,10 +588,10 @@ package body Ghost is if Is_Checked_Ghost_Entity (Par_Subp) and then Is_Ignored_Ghost_Entity (Subp) then - Error_Msg_N ("incompatible ghost policies in effect", Subp); + Error_Msg_N ("incompatible ghost policies in effect", Subp); Error_Msg_Sloc := Sloc (Par_Subp); - Error_Msg_N ("\& declared # with ghost policy `Check`", Subp); + Error_Msg_N ("\& declared # with ghost policy `Check`", Subp); Error_Msg_Sloc := Sloc (Subp); Error_Msg_N ("\overridden # with ghost policy `Ignore`", Subp); @@ -598,13 +599,13 @@ package body Ghost is elsif Is_Ignored_Ghost_Entity (Par_Subp) and then Is_Checked_Ghost_Entity (Subp) then - Error_Msg_N ("incompatible ghost policies in effect", Subp); + Error_Msg_N ("incompatible ghost policies in effect", Subp); Error_Msg_Sloc := Sloc (Par_Subp); Error_Msg_N ("\& declared # with ghost policy `Ignore`", Subp); Error_Msg_Sloc := Sloc (Subp); - Error_Msg_N ("\overridden # with ghost policy `Check`", Subp); + Error_Msg_N ("\overridden # with ghost policy `Check`", Subp); end if; end if; end Check_Ghost_Overriding; @@ -1158,7 +1159,6 @@ package body Ghost is begin if Is_Checked_Ghost_Entity (Id) then Ghost_Mode := Check; - elsif Is_Ignored_Ghost_Entity (Id) then Ghost_Mode := Ignore; end if; |