2006-10-31 Javier Miranda <miranda@adacore.com>

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

diff --git a/gcc/ada/a-wtenau.adb b/gcc/ada/a-wtenau.adb
index 1aa1afe..0bba4ec 100644 (file)
--- a/gcc/ada/a-wtenau.adb
+++ b/gcc/ada/a-wtenau.adb
@@ -1,14 +1,12 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                         GNAT RUNTIME COMPONENTS                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
 --                                                                          --
 --      A D A . W I D E _ T E X T _ I O . E N U M E R A T I O N _ A U X     --
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision$
---                                                                          --
---          Copyright (C) 1992-2002, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2006, 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- --
@@ -18,8 +16,8 @@
 -- 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.                                                      --
+-- to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, --
+-- Boston, MA 02110-1301, USA.                                              --
 --                                                                          --
 -- As a special exception,  if other files  instantiate  generics from this --
 -- unit, or you link  this unit with other files  to produce an executable, --
@@ -29,7 +27,7 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
--- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -48,10 +46,10 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
    -----------------------
 
    procedure Store_Char
-     (WC   : Wide_Character;
-      Buf  : out Wide_String;
-      Ptr  : in out Integer);
-   --  Store a single character in buffer, checking for overflow.
+     (WC  : Wide_Character;
+      Buf : out Wide_String;
+      Ptr : in out Integer);
+   --  Store a single character in buffer, checking for overflow
 
    --  These definitions replace the ones in Ada.Characters.Handling, which
    --  do not seem to work for some strange not understood reason ??? at
@@ -137,8 +135,9 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
                null;
 
             else
-               exit when Is_Letter (Character'Val (ch))
-                 and then not Is_Digit (Character'Val (ch));
+               exit when not Is_Letter (Character'Val (ch))
+                           and then
+                         not Is_Digit (Character'Val (ch));
             end if;
          end loop;
       end if;
@@ -191,9 +190,9 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
    ----------
 
    procedure Puts
-     (To    : out Wide_String;
-      Item  : in Wide_String;
-      Set   : Type_Set)
+     (To   : out Wide_String;
+      Item : Wide_String;
+      Set  : Type_Set)
    is
       Ptr : Natural;
 
@@ -281,7 +280,6 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
             end if;
          end if;
 
-         Stop := Stop - 1;
          raise Data_Error;
 
       --  Similarly for identifiers, read as far as we can, in particular,
@@ -326,9 +324,9 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
    ----------------
 
    procedure Store_Char
-     (WC   : Wide_Character;
-      Buf  : out Wide_String;
-      Ptr  : in out Integer)
+     (WC  : Wide_Character;
+      Buf : out Wide_String;
+      Ptr : in out Integer)
    is
    begin
       if Ptr = Buf'Last then