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

a-ztdeau.adb, [...] (Puts_Dec): Fix error in computing Fore when Exp > 0

Browse Source 
2008-04-08  Robert Dewar  <dewar@adacore.com>

	* a-ztdeau.adb, a-tideau.adb, a-wtdeau.adb (Puts_Dec): Fix error in
	computing Fore when Exp > 0

From-SVN: r134021
This commit is contained in:
Robert Dewar 2008-04-08 08:48:07 +02:00 committed by Arnaud Charlet
parent f2cbd97008
commit 2d7756fa26
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/ada/a-tideau.adb
View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@ -201,16 +201,24 @@ package body Ada.Text_IO.Decimal_Aux is
Ptr : Natural := 0;
begin
if Exp = 0 then
Fore := To'Length - 1 - Aft;
else
Fore := To'Length - 2 - Aft - Exp;
-- Compute Fore, allowing for Aft digits and the decimal dot
Fore := To'Length - Field'Max (1, Aft) - 1;
-- Allow for Exp and two more for E+ or E- if exponent present
if Exp /= 0 then
Fore := Fore - 2 - Exp;
end if;
-- Make sure we have enough room
if Fore < 1 then
raise Layout_Error;
end if;
-- Do the conversion and check length of result
Set_Image_Decimal (Item, Buf, Ptr, Scale, Fore, Aft, Exp);
if Ptr > To'Length then

18
gcc/ada/a-wtdeau.adb
View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@ -203,16 +203,24 @@ package body Ada.Wide_Text_IO.Decimal_Aux is
Ptr : Natural := 0;
begin
if Exp = 0 then
Fore := To'Length - 1 - Aft;
else
Fore := To'Length - 2 - Aft - Exp;
-- Compute Fore, allowing for Aft digits and the decimal dot
Fore := To'Length - Field'Max (1, Aft) - 1;
-- Allow for Exp and two more for E+ or E- if exponent present
if Exp /= 0 then
Fore := Fore - 2 - Exp;
end if;
-- Make sure we have enough room
if Fore < 1 then
raise Layout_Error;
end if;
-- Do the conversion and check length of result
Set_Image_Decimal (Item, Buf, Ptr, Scale, Fore, Aft, Exp);
if Ptr > To'Length then

18
gcc/ada/a-ztdeau.adb
View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2006, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2008, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@ -203,16 +203,24 @@ package body Ada.Wide_Wide_Text_IO.Decimal_Aux is
Ptr : Natural := 0;
begin
if Exp = 0 then
Fore := To'Length - 1 - Aft;
else
Fore := To'Length - 2 - Aft - Exp;
-- Compute Fore, allowing for Aft digits and the decimal dot
Fore := To'Length - Field'Max (1, Aft) - 1;
-- Allow for Exp and two more for E+ or E- if exponent present
if Exp /= 0 then
Fore := Fore - 2 - Exp;
end if;
-- Make sure we have enough room
if Fore < 1 then
raise Layout_Error;
end if;
-- Do the conversion and check length of result
Set_Image_Decimal (Item, Buf, Ptr, Scale, Fore, Aft, Exp);
if Ptr > To'Length then