* gcc.dg/tree-ssa/ssa-dse-10.c: Clean up all dse dump files.

[pf3gnuchains/gcc-fork.git] / gcc / ada / binderr.adb

diff --git a/gcc/ada/binderr.adb b/gcc/ada/binderr.adb
index b9ea398..949c377 100644 (file)
--- a/gcc/ada/binderr.adb
+++ b/gcc/ada/binderr.adb
@@ -6,9 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.22 $
---                                                                          --
---          Copyright (C) 1992-2000 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2007, 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,18 +16,17 @@
 -- 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.                                              --
 --                                                                          --
 -- 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.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Butil;   use Butil;
-with Namet;   use Namet;
-with Opt;     use Opt;
-with Output;  use Output;
+with Butil;  use Butil;
+with Opt;    use Opt;
+with Output; use Output;
 
 package body Binderr is
 
@@ -97,7 +94,10 @@ package body Binderr is
    ----------------------
 
    procedure Error_Msg_Output (Msg : String; Info : Boolean) is
-      Use_Second_Name : Boolean := False;
+      Use_Second_File : Boolean := False;
+      Use_Second_Unit : Boolean := False;
+      Use_Second_Nat  : Boolean := False;
+      Warning         : Boolean := False;
 
    begin
       if Warnings_Detected + Errors_Detected > Maximum_Errors then
@@ -106,7 +106,16 @@ package body Binderr is
          return;
       end if;
 
-      if Msg (Msg'First) = '?' then
+      --  First, check for warnings
+
+      for J in Msg'Range loop
+         if Msg (J) = '?' then
+            Warning := True;
+            exit;
+         end if;
+      end loop;
+
+      if Warning then
          Write_Str ("warning: ");
       elsif Info then
          if not Info_Prefix_Suppress then
@@ -116,34 +125,47 @@ package body Binderr is
          Write_Str ("error: ");
       end if;
 
-      for I in Msg'Range loop
-         if Msg (I) = '%' then
+      for J in Msg'Range loop
+         if Msg (J) = '%' then
+            Get_Name_String (Error_Msg_Name_1);
+            Write_Char ('"');
+            Write_Str (Name_Buffer (1 .. Name_Len));
+            Write_Char ('"');
 
-            if Use_Second_Name then
-               Get_Name_String (Error_Msg_Name_2);
+         elsif Msg (J) = '{' then
+            if Use_Second_File then
+               Get_Name_String (Error_Msg_File_2);
             else
-               Use_Second_Name := True;
-               Get_Name_String (Error_Msg_Name_1);
+               Use_Second_File := True;
+               Get_Name_String (Error_Msg_File_1);
             end if;
 
             Write_Char ('"');
             Write_Str (Name_Buffer (1 .. Name_Len));
             Write_Char ('"');
 
-         elsif Msg (I) = '&' then
+         elsif Msg (J) = '$' then
             Write_Char ('"');
 
-            if Use_Second_Name then
-               Write_Unit_Name (Error_Msg_Name_2);
+            if Use_Second_Unit then
+               Write_Unit_Name (Error_Msg_Unit_2);
             else
-               Use_Second_Name := True;
-               Write_Unit_Name (Error_Msg_Name_1);
+               Use_Second_Unit := True;
+               Write_Unit_Name (Error_Msg_Unit_1);
             end if;
 
             Write_Char ('"');
 
-         elsif Msg (I) /= '?' then
-            Write_Char (Msg (I));
+         elsif Msg (J) = '#' then
+            if Use_Second_Nat then
+               Write_Int (Error_Msg_Nat_2);
+            else
+               Use_Second_Nat := True;
+               Write_Int (Error_Msg_Nat_1);
+            end if;
+
+         elsif Msg (J) /= '?' then
+            Write_Char (Msg (J));
          end if;
       end loop;