2009-08-28 Sebastian Pop <sebastian.pop@amd.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / a-wtflau.adb

diff --git a/gcc/ada/a-wtflau.adb b/gcc/ada/a-wtflau.adb
index c7c6741..419ea70 100644 (file)
--- a/gcc/ada/a-wtflau.adb
+++ b/gcc/ada/a-wtflau.adb
@@ -6,25 +6,23 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2009, 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- --
--- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
--- for  more details.  You should have  received  a copy of the GNU General --
--- Public License  distributed with GNAT;  see file COPYING.  If not, write --
--- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, USA.                                                      --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
 --                                                                          --
--- As a special exception,  if other files  instantiate  generics from this --
--- unit, or you link  this unit with other files  to produce an executable, --
--- this  unit  does not  by itself cause  the resulting  executable  to  be --
--- covered  by the  GNU  General  Public  License.  This exception does not --
--- however invalidate  any other reasons why  the executable file  might be --
--- covered by the  GNU Public License.                                      --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
@@ -43,9 +41,9 @@ package body Ada.Wide_Text_IO.Float_Aux is
    ---------
 
    procedure Get
-     (File  : in File_Type;
+     (File  : File_Type;
       Item  : out Long_Long_Float;
-      Width : in Field)
+      Width : Field)
    is
       Buf  : String (1 .. Field'Last);
       Stop : Integer := 0;
@@ -69,7 +67,7 @@ package body Ada.Wide_Text_IO.Float_Aux is
    ----------
 
    procedure Gets
-     (From : in String;
+     (From : String;
       Item : out Long_Long_Float;
       Last : out Positive)
    is
@@ -82,7 +80,6 @@ package body Ada.Wide_Text_IO.Float_Aux is
 
    exception
       when Constraint_Error =>
-         Last := Pos - 1;
          raise Data_Error;
    end Gets;
 
@@ -91,7 +88,7 @@ package body Ada.Wide_Text_IO.Float_Aux is
    ---------------
 
    procedure Load_Real
-     (File : in File_Type;
+     (File : File_Type;
       Buf  : out String;
       Ptr  : in out Natural)
    is
@@ -139,6 +136,7 @@ package body Ada.Wide_Text_IO.Float_Aux is
 
             if Loaded then
                Load_Extended_Digits (File, Buf, Ptr);
+               Load (File, Buf, Ptr, '#', ':');
 
             --  Case of nnn#xxx.[xxx]# or nnn#xxx#
 
@@ -159,6 +157,13 @@ package body Ada.Wide_Text_IO.Float_Aux is
          --  Case of nnn.[nnn] or nnn
 
          else
+            --  Prevent the potential processing of '.' in cases where the
+            --  initial digits have a trailing underscore.
+
+            if Buf (Ptr) = '_' then
+               return;
+            end if;
+
             Load (File, Buf, Ptr, '.', Loaded);
 
             if Loaded then
@@ -182,11 +187,11 @@ package body Ada.Wide_Text_IO.Float_Aux is
    ---------
 
    procedure Put
-     (File : in File_Type;
-      Item : in Long_Long_Float;
-      Fore : in Field;
-      Aft  : in Field;
-      Exp  : in Field)
+     (File : File_Type;
+      Item : Long_Long_Float;
+      Fore : Field;
+      Aft  : Field;
+      Exp  : Field)
    is
       Buf : String (1 .. Field'Last);
       Ptr : Natural := 0;
@@ -202,12 +207,12 @@ package body Ada.Wide_Text_IO.Float_Aux is
 
    procedure Puts
      (To   : out String;
-      Item : in Long_Long_Float;
-      Aft  : in Field;
-      Exp  : in Field)
+      Item : Long_Long_Float;
+      Aft  : Field;
+      Exp  : Field)
    is
-      Buf    : String (1 .. Field'Last);
-      Ptr    : Natural := 0;
+      Buf : String (1 .. Field'Last);
+      Ptr : Natural := 0;
 
    begin
       Set_Image_Real (Item, Buf, Ptr, Fore => 1, Aft => Aft, Exp => Exp);