2012-01-10 Bob Duff <duff@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / fname-sf.adb

diff --git a/gcc/ada/fname-sf.adb b/gcc/ada/fname-sf.adb
index 962b335..f967c16 100644 (file)
--- a/gcc/ada/fname-sf.adb
+++ b/gcc/ada/fname-sf.adb
@@ -6,18 +6,17 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2000 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- --
--- 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.                                                      --
+-- Public License  distributed with GNAT; see file COPYING3.  If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license.          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
@@ -28,7 +27,6 @@ with Casing;   use Casing;
 with Fname;    use Fname;
 with Fname.UF; use Fname.UF;
 with SFN_Scan; use SFN_Scan;
-with Namet;    use Namet;
 with Osint;    use Osint;
 with Types;    use Types;
 
@@ -36,9 +34,6 @@ with Unchecked_Conversion;
 
 package body Fname.SF is
 
-   subtype Big_String is String (Positive);
-   type Big_String_Ptr is access all Big_String;
-
    function To_Big_String_Ptr is new Unchecked_Conversion
      (Source_Buffer_Ptr, Big_String_Ptr);
 
@@ -46,7 +41,11 @@ package body Fname.SF is
    -- Local Procedures --
    ----------------------
 
-   procedure Set_File_Name (Typ : Character; U : String; F : String);
+   procedure Set_File_Name
+     (Typ   : Character;
+      U     : String;
+      F     : String;
+      Index : Natural);
    --  This is a transfer function that is called from Scan_SFN_Pragmas,
    --  and reformats its parameters appropriately for the version of
    --  Set_File_Name found in Fname.SF.
@@ -89,10 +88,14 @@ package body Fname.SF is
    -- Set_File_Name --
    -------------------
 
-   procedure Set_File_Name (Typ : Character; U : String; F : String) is
+   procedure Set_File_Name
+     (Typ   : Character;
+      U     : String;
+      F     : String;
+      Index : Natural)
+   is
       Unm : Unit_Name_Type;
       Fnm : File_Name_Type;
-
    begin
       Name_Buffer (1 .. U'Length) := U;
       Name_Len := U'Length;
@@ -104,7 +107,7 @@ package body Fname.SF is
       Name_Buffer (1 .. F'Length) := F;
       Name_Len := F'Length;
       Fnm := Name_Find;
-      Fname.UF.Set_File_Name (Unm, Fnm);
+      Fname.UF.Set_File_Name (Unm, Fnm, Nat (Index));
    end Set_File_Name;
 
    ---------------------------