diff options
| author | Joffrey Huguet <huguet@adacore.com> | 2021-06-10 11:39:01 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-07-09 12:35:29 +0000 |
| commit | 021cf768fba5724f6d419fbbd574ca12c76c616c (patch) | |
| tree | f1324479ceda817ec53a486085042bb39fcf4379 /gcc/ada/libgnat | |
| parent | 2390451ede49fa09bc0d9692802651aff66ae8a6 (diff) | |
| download | gcc-021cf768fba5724f6d419fbbd574ca12c76c616c.zip gcc-021cf768fba5724f6d419fbbd574ca12c76c616c.tar.gz gcc-021cf768fba5724f6d419fbbd574ca12c76c616c.tar.bz2 | |
[Ada] Fix layout of contracts
gcc/ada/
* libgnat/a-strunb.ads, libgnat/a-strunb__shared.ads: Fix layout
in contracts.
Diffstat (limited to 'gcc/ada/libgnat')
| -rw-r--r-- | gcc/ada/libgnat/a-strunb.ads | 29 | ||||
| -rw-r--r-- | gcc/ada/libgnat/a-strunb__shared.ads | 11 |
2 files changed, 18 insertions, 22 deletions
diff --git a/gcc/ada/libgnat/a-strunb.ads b/gcc/ada/libgnat/a-strunb.ads index 89c8339..13c7612 100644 --- a/gcc/ada/libgnat/a-strunb.ads +++ b/gcc/ada/libgnat/a-strunb.ads @@ -81,7 +81,7 @@ is -------------------------------------------------------- function To_Unbounded_String - (Source : String) return Unbounded_String + (Source : String) return Unbounded_String with Post => Length (To_Unbounded_String'Result) = Source'Length, Global => null; @@ -91,8 +91,7 @@ is (Length : Natural) return Unbounded_String with Post => - Ada.Strings.Unbounded.Length (To_Unbounded_String'Result) - = Length, + Ada.Strings.Unbounded.Length (To_Unbounded_String'Result) = Length, Global => null; -- Returns an Unbounded_String that represents an uninitialized String -- whose length is Length. @@ -524,11 +523,11 @@ is with Pre => Low - 1 <= Length (Source) - and then (if High >= Low - then Low - 1 - <= Natural'Last - By'Length - - Natural'Max (Length (Source) - High, 0) - else Length (Source) <= Natural'Last - By'Length), + and then (if High >= Low + then Low - 1 + <= Natural'Last - By'Length + - Natural'Max (Length (Source) - High, 0) + else Length (Source) <= Natural'Last - By'Length), Contract_Cases => (High >= Low => Length (Replace_Slice'Result) @@ -545,11 +544,11 @@ is with Pre => Low - 1 <= Length (Source) - and then (if High >= Low - then Low - 1 - <= Natural'Last - By'Length - - Natural'Max (Length (Source) - High, 0) - else Length (Source) <= Natural'Last - By'Length), + and then (if High >= Low + then Low - 1 + <= Natural'Last - By'Length + - Natural'Max (Length (Source) - High, 0) + else Length (Source) <= Natural'Last - By'Length), Contract_Cases => (High >= Low => Length (Source) @@ -586,7 +585,7 @@ is Pre => Position - 1 <= Length (Source) and then (if New_Item'Length /= 0 then - New_Item'Length <= Natural'Last - (Position - 1)), + New_Item'Length <= Natural'Last - (Position - 1)), Post => Length (Overwrite'Result) = Natural'Max (Length (Source), Position - 1 + New_Item'Length), @@ -600,7 +599,7 @@ is Pre => Position - 1 <= Length (Source) and then (if New_Item'Length /= 0 then - New_Item'Length <= Natural'Last - (Position - 1)), + New_Item'Length <= Natural'Last - (Position - 1)), Post => Length (Source) = Natural'Max (Length (Source)'Old, Position - 1 + New_Item'Length), diff --git a/gcc/ada/libgnat/a-strunb__shared.ads b/gcc/ada/libgnat/a-strunb__shared.ads index 6382252..2091bde 100644 --- a/gcc/ada/libgnat/a-strunb__shared.ads +++ b/gcc/ada/libgnat/a-strunb__shared.ads @@ -363,9 +363,8 @@ is Going : Direction := Forward; Mapping : Maps.Character_Mapping := Maps.Identity) return Natural with - Pre => (if Length (Source) /= 0 - then From <= Length (Source)) - and then Pattern'Length /= 0, + Pre => (if Length (Source) /= 0 then From <= Length (Source)) + and then Pattern'Length /= 0, Global => null; pragma Ada_05 (Index); @@ -376,11 +375,9 @@ is Going : Direction := Forward; Mapping : Maps.Character_Mapping_Function) return Natural with - Pre => (if Length (Source) /= 0 - then From <= Length (Source)) - and then Pattern'Length /= 0, + Pre => (if Length (Source) /= 0 then From <= Length (Source)) + and then Pattern'Length /= 0, Global => null; - pragma Ada_05 (Index); function Index |