diff options
| author | Bob Duff <duff@adacore.com> | 2017-01-12 13:18:47 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-01-12 14:18:47 +0100 |
| commit | 6e759c2a0f950ce535e7907db39ddc3866782ade (patch) | |
| tree | 34bbc627f9d596a221f332486cdfee42a77f8d6b /gcc/ada/contracts.adb | |
| parent | 6bb4ea5cdf9664f2cec861a2a120192b4ac04d1f (diff) | |
| download | gcc-6e759c2a0f950ce535e7907db39ddc3866782ade.zip gcc-6e759c2a0f950ce535e7907db39ddc3866782ade.tar.gz gcc-6e759c2a0f950ce535e7907db39ddc3866782ade.tar.bz2 | |
contracts.adb, [...] (Pragma_Name): Change name to Pragma_Name_Unmapped.
2017-01-12 Bob Duff <duff@adacore.com>
* contracts.adb, einfo.adb, errout.adb, exp_attr.adb,
exp_ch3.adb, exp_ch7.adb, exp_ch9.adb, exp_prag.adb, freeze.adb,
frontend.adb, ghost.adb, inline.adb, lib-writ.adb, lib-xref.adb,
par.adb, par-ch10.adb, par-ch2.adb, par-prag.adb, par_sco.adb,
sem_attr.adb, sem_aux.adb, sem_ch10.adb, sem_ch12.adb,
sem_ch13.adb, sem_ch6.adb, sem_ch8.adb, sem_ch9.adb, sem_elab.adb,
sem_prag.adb, sem_res.adb, sem_util.adb, sem_util.ads,
sem_warn.adb, sinfo.adb, sinfo.ads, sprint.adb (Pragma_Name):
Change name to Pragma_Name_Unmapped.
(Pragma_Name_Mapped): Change name to Pragma_Name.
This is because the "mapped" version should be the usual case.
From-SVN: r244352
Diffstat (limited to 'gcc/ada/contracts.adb')
| -rw-r--r-- | gcc/ada/contracts.adb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb index 7ed7e41..fbfc684 100644 --- a/gcc/ada/contracts.adb +++ b/gcc/ada/contracts.adb @@ -118,7 +118,7 @@ package body Contracts is -- A contract must contain only pragmas pragma Assert (Nkind (Prag) = N_Pragma); - Prag_Nam : constant Name_Id := Pragma_Name_Mapped (Prag); + Prag_Nam : constant Name_Id := Pragma_Name (Prag); -- Start of processing for Add_Contract_Item @@ -575,7 +575,7 @@ package body Contracts is Prag := Contract_Test_Cases (Items); while Present (Prag) loop - Prag_Nam := Pragma_Name_Mapped (Prag); + Prag_Nam := Pragma_Name (Prag); if Prag_Nam = Name_Contract_Cases then @@ -604,7 +604,7 @@ package body Contracts is Prag := Classifications (Items); while Present (Prag) loop - Prag_Nam := Pragma_Name_Mapped (Prag); + Prag_Nam := Pragma_Name (Prag); if Prag_Nam = Name_Depends then Depends := Prag; @@ -1019,7 +1019,7 @@ package body Contracts is Prag := Classifications (Items); while Present (Prag) loop - Prag_Nam := Pragma_Name_Mapped (Prag); + Prag_Nam := Pragma_Name (Prag); if Prag_Nam = Name_Initial_Condition then Init_Cond := Prag; @@ -1785,7 +1785,7 @@ package body Contracts is if Present (Items) then Prag := Contract_Test_Cases (Items); while Present (Prag) loop - if Pragma_Name_Mapped (Prag) = Name_Contract_Cases then + if Pragma_Name (Prag) = Name_Contract_Cases then Expand_Pragma_Contract_Cases (CCs => Prag, Subp_Id => Subp_Id, @@ -1838,7 +1838,7 @@ package body Contracts is if Present (Items) then Prag := Pre_Post_Conditions (Items); while Present (Prag) loop - if Pragma_Name_Mapped (Prag) = Post_Nam then + if Pragma_Name (Prag) = Post_Nam then Append_Enabled_Item (Item => Build_Pragma_Check_Equivalent (Prag), List => Stmts); @@ -1860,7 +1860,7 @@ package body Contracts is -- Note that non-matching pragmas are skipped if Nkind (Decl) = N_Pragma then - if Pragma_Name_Mapped (Decl) = Post_Nam then + if Pragma_Name (Decl) = Post_Nam then Append_Enabled_Item (Item => Build_Pragma_Check_Equivalent (Decl), List => Stmts); @@ -1902,7 +1902,7 @@ package body Contracts is if Present (Items) then Prag := Pre_Post_Conditions (Items); while Present (Prag) loop - if Pragma_Name_Mapped (Prag) = Name_Postcondition then + if Pragma_Name (Prag) = Name_Postcondition then Append_Enabled_Item (Item => Build_Pragma_Check_Equivalent (Prag), List => Stmts); @@ -1922,7 +1922,7 @@ package body Contracts is if Present (Items) then Prag := Pre_Post_Conditions (Items); while Present (Prag) loop - if Pragma_Name_Mapped (Prag) = Name_Postcondition + if Pragma_Name (Prag) = Name_Postcondition and then Class_Present (Prag) then Append_Enabled_Item @@ -2189,7 +2189,7 @@ package body Contracts is if Present (Items) then Prag := Pre_Post_Conditions (Items); while Present (Prag) loop - if Pragma_Name_Mapped (Prag) = Name_Precondition + if Pragma_Name (Prag) = Name_Precondition and then Class_Present (Prag) then Check_Prag := @@ -2238,7 +2238,7 @@ package body Contracts is if Present (Items) then Prag := Pre_Post_Conditions (Items); while Present (Prag) loop - if Pragma_Name_Mapped (Prag) = Name_Precondition then + if Pragma_Name (Prag) = Name_Precondition then Prepend_To_Decls_Or_Save (Prag); end if; @@ -2263,7 +2263,7 @@ package body Contracts is -- Note that non-matching pragmas are skipped if Nkind (Decl) = N_Pragma then - if Pragma_Name_Mapped (Decl) = Name_Precondition then + if Pragma_Name (Decl) = Name_Precondition then Prepend_To_Decls_Or_Save (Decl); end if; |