git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a-stzfix.adb, [...] (Replace_Slice): Fixed computation when High is above Source length. 

2011-08-01  Vincent Celier  <celier@adacore.com>

	* a-stzfix.adb, a-stwifi.adb (Replace_Slice): Fixed computation when
	High is above Source length.

From-SVN: r177007
This commit is contained in:
Vincent Celier 2011-08-01 10:15:08 +00:00 committed by Arnaud Charlet
parent ff58cc6919
commit a3a16b2187
3 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-01 Vincent Celier <celier@adacore.com>
* a-stzfix.adb, a-stwifi.adb (Replace_Slice): Fixed computation when
High is above Source length.
2011-08-01 Robert Dewar <dewar@adacore.com>
* a-ztexio.ads, a-textio.ads, a-witeio.ads: Fix comment.

38
gcc/ada/a-stwifi.adb
View File

@ -447,30 +447,40 @@ package body Ada.Strings.Wide_Fixed is
High : Natural;
By : Wide_String) return Wide_String
is
Result_Length : Natural;
begin
if Low > Source'Last + 1 or else High < Source'First - 1 then
raise Index_Error;
else
Result_Length :=
Source'Length - Natural'Max (High - Low + 1, 0) + By'Length;
end if;
if High >= Low then
declare
Result : Wide_String (1 .. Result_Length);
Front_Len : constant Integer :=
Integer'Max (0, Low - Source'First);
-- Length of prefix of Source copied to result
Back_Len : constant Integer :=
Integer'Max (0, Source'Last - High);
-- Length of suffix of Source copied to result
Result_Length : constant Integer :=
Front_Len + By'Length + Back_Len;
-- Length of result
Result : Wide_String (1 .. Result_Length);
begin
if High >= Low then
Result :=
Source (Source'First .. Low - 1) & By &
Source (High + 1 .. Source'Last);
else
Result := Source (Source'First .. Low - 1) & By &
Source (Low .. Source'Last);
end if;
Result (1 .. Front_Len) :=
Source (Source'First .. Low - 1);
Result (Front_Len + 1 .. Front_Len + By'Length) :=
By;
Result (Front_Len + By'Length + 1 .. Result'Length) :=
Source (High + 1 .. Source'Last);
return Result;
end;
else
return Insert (Source, Before => Low, New_Item => By);
end if;
end Replace_Slice;

36
gcc/ada/a-stzfix.adb
View File

@ -449,30 +449,40 @@ package body Ada.Strings.Wide_Wide_Fixed is
High : Natural;
By : Wide_Wide_String) return Wide_Wide_String
is
Result_Length : Natural;
begin
if Low > Source'Last + 1 or else High < Source'First - 1 then
raise Index_Error;
else
Result_Length :=
Source'Length - Natural'Max (High - Low + 1, 0) + By'Length;
end if;
if High >= Low then
declare
Front_Len : constant Integer :=
Integer'Max (0, Low - Source'First);
-- Length of prefix of Source copied to result
Back_Len : constant Integer :=
Integer'Max (0, Source'Last - High);
-- Length of suffix of Source copied to result
Result_Length : constant Integer :=
Front_Len + By'Length + Back_Len;
-- Length of result
Result : Wide_Wide_String (1 .. Result_Length);
begin
if High >= Low then
Result :=
Source (Source'First .. Low - 1) & By &
Source (High + 1 .. Source'Last);
else
Result := Source (Source'First .. Low - 1) & By &
Source (Low .. Source'Last);
end if;
Result (1 .. Front_Len) :=
Source (Source'First .. Low - 1);
Result (Front_Len + 1 .. Front_Len + By'Length) :=
By;
Result (Front_Len + By'Length + 1 .. Result'Length) :=
Source (High + 1 .. Source'Last);
return Result;
end;
else
return Insert (Source, Before => Low, New_Item => By);
end if;
end Replace_Slice;