X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fada%2Fs-trafor-default.adb;h=93f0e24c5b3cf7ee328efa95acdeccd32a7fd9bc;hb=43537c9651f05e0ad6ba2c752dcfdfb762ef8376;hp=1918caed0f62d1d40a3ba47df465402730db48e6;hpb=f27cea3abf8ded22456f5f46a812cc3915969815;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/ada/s-trafor-default.adb b/gcc/ada/s-trafor-default.adb index 1918caed0f6..93f0e24c5b3 100644 --- a/gcc/ada/s-trafor-default.adb +++ b/gcc/ada/s-trafor-default.adb @@ -6,25 +6,23 @@ -- -- -- 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 -- +-- . -- -- -- -- GNAT was originally developed by the GNAT team at New York University. -- -- Extensive contributions were provided by Ada Core Technologies Inc. -- @@ -41,9 +39,9 @@ package body System.Traces.Format is -- 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 @@ -54,7 +52,8 @@ package body System.Traces.Format is 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; @@ -68,25 +67,25 @@ package body System.Traces.Format is 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) := @@ -99,6 +98,7 @@ package body System.Traces.Format is 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) :=