-- --
-- B o d y --
-- --
--- Copyright (C) 1992,1993,1994,1995,1996 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. --
-- --
------------------------------------------------------------------------------
-with GNAT.Heap_Sort_A; use GNAT.Heap_Sort_A;
+with GNAT.Heap_Sort_G;
separate (Lib)
procedure Sort (Tbl : in out Unit_Ref_Table) is
-- even though we have to copy Tbl back and forth.
function Lt_Uname (C1, C2 : Natural) return Boolean;
- -- Comparison routine for comparing Unames. Needed by the sorting routine.
+ -- Comparison routine for comparing Unames. Needed by the sorting routine
procedure Move_Uname (From : Natural; To : Natural);
- -- Move routine needed by the sorting routine below.
+ -- Move routine needed by the sorting routine below
+
+ package Sorting is new GNAT.Heap_Sort_G (Move_Uname, Lt_Uname);
--------------
-- Lt_Uname --
function Lt_Uname (C1, C2 : Natural) return Boolean is
begin
- return
- Uname_Lt
- (Units.Table (T (C1)).Unit_Name, Units.Table (T (C2)).Unit_Name);
+ -- Preprocessing data and definition files are not sorted, they are
+ -- at the bottom of the list. They are recognized because they are
+ -- the only ones without a Unit_Name.
+
+ if Units.Table (T (C1)).Unit_Name = No_Unit_Name then
+ return False;
+
+ elsif Units.Table (T (C2)).Unit_Name = No_Unit_Name then
+ return True;
+
+ else
+ return
+ Uname_Lt
+ (Units.Table (T (C1)).Unit_Name, Units.Table (T (C2)).Unit_Name);
+ end if;
end Lt_Uname;
----------------
T (I) := Tbl (Int (I) - 1 + Tbl'First);
end loop;
- Sort (T'Last,
- Move_Uname'Unrestricted_Access, Lt_Uname'Unrestricted_Access);
+ Sorting.Sort (T'Last);
-- Sort is complete, copy result back into place