OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Facilitate proof of Overwrite in bounded strings library 

Consistently use >= operator in both the code and contracts of
function/procedure Overwrite, to facilitate proof, instead of the strict
inequality > sometimes, as only New_Item remains in the result in the
case of equal size too.

gcc/ada/

	* libgnat/a-strbou.ads (Overwrite): Switch to >= operator in
	contracts.
	* libgnat/a-strsup.adb (Super_Overwrite): Switch to >= operator
	in code of procedure (function already uses it).
	* libgnat/a-strsup.ads (Super_Overwrite): Switch to >= operator
	in contracts.
This commit is contained in:
Yannick Moy 2022-02-23 12:58:42 +01:00 committed by Pierre-Marie de Rodat
parent 9e5b1b076a
commit 3fe35ab093
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ada/libgnat/a-strbou.ads
View File

@ -1898,7 +1898,7 @@ package Ada.Strings.Bounded with SPARK_Mode is
-- some characters of Source are remaining at the left.
and then
(if New_Item'Length > Max_Length then
(if New_Item'Length >= Max_Length then
-- New_Item covers all Max_Length characters
@ -1984,7 +1984,7 @@ package Ada.Strings.Bounded with SPARK_Mode is
-- some characters of Source are remaining at the left.
and then
(if New_Item'Length > Max_Length then
(if New_Item'Length >= Max_Length then
-- New_Item covers all Max_Length characters

2
gcc/ada/libgnat/a-strsup.adb
View File

@ -1226,7 +1226,7 @@ package body Ada.Strings.Superbounded with SPARK_Mode is
(New_Item (New_Item'First .. New_Item'Last - Droplen));
when Strings.Left =>
if New_Item'Length > Max_Length then
if New_Item'Length >= Max_Length then
Source.Data (1 .. Max_Length) := Super_String_Data
(New_Item
(New_Item'Last - Max_Length + 1 .. New_Item'Last));

4
gcc/ada/libgnat/a-strsup.ads
View File

@ -2000,7 +2000,7 @@ package Ada.Strings.Superbounded with SPARK_Mode is
-- Source are remaining at the left.
and then
(if New_Item'Length > Source.Max_Length then
(if New_Item'Length >= Source.Max_Length then
-- New_Item covers all Max_Length characters
@ -2089,7 +2089,7 @@ package Ada.Strings.Superbounded with SPARK_Mode is
-- Source are remaining at the left.
and then
(if New_Item'Length > Source.Max_Length then
(if New_Item'Length >= Source.Max_Length then
-- New_Item covers all Max_Length characters