-- --
-- B o d y --
-- --
--- Copyright (C) 2001-2005 Free Software Foundation, Inc. --
+-- Copyright (C) 2001-2009, Free Software Foundation, Inc. --
-- --
--- GNARL is free software; you can redistribute it and/or modify it under --
+-- GNARL 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- --
--- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
+-- 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 GNARL; see file COPYING. If not, write --
--- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
--- Boston, MA 02110-1301, 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. --
-- Format_Trace --
------------------
- function Format_Trace (Source : in String) return String_Trace is
- Length : Integer := Source'Length;
- Result : String_Trace := (others => ' ');
+ function Format_Trace (Source : String) return String_Trace is
+ Length : constant Integer := Source'Length;
+ Result : String_Trace := (others => ' ');
begin
-- If run-time tracing active, then fill the string
Result (Length + 1 .. Max_Size) := (others => ' ');
Result (Length + 1) := ASCII.NUL;
else
- Result (1 .. Max_Size - 1) := Source (1 .. Max_Size - 1);
+ Result (1 .. Max_Size - 1) :=
+ Source (Source'First .. Source'First - 1 + Max_Size - 1);
Result (Max_Size) := ASCII.NUL;
end if;
end if;
function Append
(Source : String_Trace;
- Annex : String)
- return String_Trace
+ Annex : String) return String_Trace
is
- Result : String_Trace := (others => ' ');
- Source_Length : Integer := 1;
- Annex_Length : Integer := Annex'Length;
+ Result : String_Trace := (others => ' ');
+ Annex_Length : constant Integer := Annex'Length;
+ Source_Length : Integer;
begin
if Parameters.Runtime_Traces then
- -- First we determine the size used, without the spaces at the
- -- end, if a String_Trace is present. Look at
- -- System.Traces.Tasking for examples.
+ -- First we determine the size used, without the spaces at the end,
+ -- if a String_Trace is present. Look at System.Traces.Tasking for
+ -- examples.
+ Source_Length := 1;
while Source (Source_Length) /= ASCII.NUL loop
Source_Length := Source_Length + 1;
end loop;
- -- Then we fill the string.
+ -- Then we fill the string
if Source_Length - 1 + Annex_Length <= Max_Size then
Result (1 .. Source_Length - 1) :=
Result (Source_Length + Annex_Length + 1 .. Max_Size) :=
(others => ' ');
+
else
Result (1 .. Source_Length - 1) := Source (1 .. Source_Length - 1);
Result (Source_Length .. Max_Size - 1) :=
OSDN Git Service
