-- --
-- B o d y --
-- --
--- $Revision: 1.43 $
--- --
--- Copyright (C) 1992-2001 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 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. --
-- --
--- 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. --
+-- 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. --
--- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+-- Extensive contributions were provided by Ada Core Technologies Inc. --
-- --
------------------------------------------------------------------------------
package Strings is new Table.Table (
Table_Component_Type => String_Entry,
- Table_Index_Type => String_Id,
+ Table_Index_Type => String_Id'Base,
Table_Low_Bound => First_String_Id,
Table_Initial => Alloc.Strings_Initial,
Table_Increment => Alloc.Strings_Increment,
procedure Add_String_To_Name_Buffer (S : String_Id) is
Len : constant Natural := Natural (String_Length (S));
+
begin
for J in 1 .. Len loop
Name_Buffer (Name_Len + J) :=
procedure Start_String is
begin
- Strings.Increment_Last;
- Strings.Table (Strings.Last).String_Index := String_Chars.Last + 1;
- Strings.Table (Strings.Last).Length := 0;
+ Strings.Append ((String_Index => String_Chars.Last + 1, Length => 0));
end Start_String;
-- Version to start from initially stored string
String_Chars.Last + 1;
for J in 1 .. Strings.Table (S).Length loop
- String_Chars.Increment_Last;
- String_Chars.Table (String_Chars.Last) :=
- String_Chars.Table (Strings.Table (S).String_Index + (J - 1));
+ String_Chars.Append
+ (String_Chars.Table (Strings.Table (S).String_Index + (J - 1)));
end loop;
end if;
procedure Store_String_Char (C : Char_Code) is
begin
- String_Chars.Increment_Last;
- String_Chars.Table (String_Chars.Last) := C;
+ String_Chars.Append (C);
Strings.Table (Strings.Last).Length :=
Strings.Table (Strings.Last).Length + 1;
end Store_String_Char;
end Store_String_Chars;
procedure Store_String_Chars (S : String_Id) is
+
+ -- We are essentially doing this:
+
+ -- for J in 1 .. String_Length (S) loop
+ -- Store_String_Char (Get_String_Char (S, J));
+ -- end loop;
+
+ -- but when the string is long it's more efficient to grow the
+ -- String_Chars table all at once.
+
+ S_First : constant Int := Strings.Table (S).String_Index;
+ S_Len : constant Int := String_Length (S);
+ Old_Last : constant Int := String_Chars.Last;
+ New_Last : constant Int := Old_Last + S_Len;
+
begin
- for J in 1 .. String_Length (S) loop
- Store_String_Char (Get_String_Char (S, J));
- end loop;
+ String_Chars.Set_Last (New_Last);
+ String_Chars.Table (Old_Last + 1 .. New_Last) :=
+ String_Chars.Table (S_First .. S_First + S_Len - 1);
+ Strings.Table (Strings.Last).Length :=
+ Strings.Table (Strings.Last).Length + S_Len;
end Store_String_Chars;
----------------------
procedure Write_Char_Code (Code : Char_Code) is
- procedure Write_Hex_Byte (J : Natural);
- -- Write single hex digit
+ procedure Write_Hex_Byte (J : Char_Code);
+ -- Write single hex byte (value in range 0 .. 255) as two digits
- procedure Write_Hex_Byte (J : Natural) is
- Hexd : String := "0123456789abcdef";
+ --------------------
+ -- Write_Hex_Byte --
+ --------------------
+ procedure Write_Hex_Byte (J : Char_Code) is
+ Hexd : constant array (Char_Code range 0 .. 15) of Character :=
+ "0123456789abcdef";
begin
- Write_Char (Hexd (J / 16 + 1));
- Write_Char (Hexd (J mod 16 + 1));
+ Write_Char (Hexd (J / 16));
+ Write_Char (Hexd (J mod 16));
end Write_Hex_Byte;
-- Start of processing for Write_Char_Code
Write_Char ('[');
Write_Char ('"');
+ if Code > 16#FF_FFFF# then
+ Write_Hex_Byte (Code / 2 ** 24);
+ end if;
+
+ if Code > 16#FFFF# then
+ Write_Hex_Byte ((Code / 2 ** 16) mod 256);
+ end if;
+
if Code > 16#FF# then
- Write_Hex_Byte (Natural (Code / 256));
+ Write_Hex_Byte ((Code / 256) mod 256);
end if;
- Write_Hex_Byte (Natural (Code mod 256));
+ Write_Hex_Byte (Code mod 256);
Write_Char ('"');
Write_Char (']');
end if;
for J in 1 .. String_Length (Id) loop
C := Get_String_Char (Id, J);
- if Character'Val (C) = '"' then
+ if C = Character'Pos ('"') then
Write_Str ("""""");
-
else
Write_Char_Code (C);
end if;
+
+ -- If string is very long, quit
+
+ if J >= 1000 then -- arbitrary limit
+ Write_Str ("""...etc (length = ");
+ Write_Int (String_Length (Id));
+ Write_Str (")");
+ return;
+ end if;
end loop;
Write_Char ('"');