diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-22 13:15:15 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-22 13:15:15 +0000 |
| commit | 5f86d0eef9906b51b59a217c7677f27a01bbc9fb (patch) | |
| tree | 69eb259722c9b0825b0b815a931a22adb180d32a /gcc/ada/impunit.adb | |
| parent | 1cd02ab1e77fa43ab55f4268cab2112f5dc5faa1 (diff) | |
| download | gcc-5f86d0eef9906b51b59a217c7677f27a01bbc9fb.tar.gz | |
2010-06-22 Robert Dewar <dewar@adacore.com>
* uintp.adb, osint.adb, prj-conf.adb, prj-part.adb, prj.adb: Minor
reformatting.
* s-taprop-vxworks.adb: Add comment for Set_Priority.
* impunit.adb (Map_Array): Add entries for s-htable.ads and s-crc32.ads
* projects.texi: Move @cindex to the left margin, since otherwise we
are missing entries in the index.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161179 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/impunit.adb')
| -rw-r--r-- | gcc/ada/impunit.adb | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gcc/ada/impunit.adb b/gcc/ada/impunit.adb index 0f3ad5793ec..83710311cd2 100644 --- a/gcc/ada/impunit.adb +++ b/gcc/ada/impunit.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2000-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 2000-2010, 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- -- @@ -494,6 +494,8 @@ package body Impunit is -- Array of alternative unit names Scasuti : aliased String := "GNAT.Case_Util"; + Scrc32 : aliased String := "GNAT.CRC32"; + Shtable : aliased String := "GNAT.HTable"; Sos_lib : aliased String := "GNAT.OS_Lib"; Sregexp : aliased String := "GNAT.Regexp"; Sregpat : aliased String := "GNAT.Regpat"; @@ -504,8 +506,10 @@ package body Impunit is -- Array giving mapping - Map_Array : constant array (1 .. 8) of Aunit_Record := ( + Map_Array : constant array (1 .. 10) of Aunit_Record := ( ("casuti", Scasuti'Access), + ("crc32 ", Scrc32 'Access), + ("htable", Shtable'Access), ("os_lib", Sos_lib'Access), ("regexp", Sregexp'Access), ("regpat", Sregpat'Access), @@ -609,12 +613,17 @@ package body Impunit is Get_Name_String (Fname); - if Name_Len = 12 + if Name_Len in 11 .. 12 and then Name_Buffer (1 .. 2) = "s-" - and then Name_Buffer (9 .. 12) = ".ads" + and then Name_Buffer (Name_Len - 3 .. Name_Len) = ".ads" then for J in Map_Array'Range loop - if Name_Buffer (3 .. 8) = Map_Array (J).Fname then + if (Name_Len = 12 and then + Name_Buffer (3 .. 8) = Map_Array (J).Fname) + or else + (Name_Len = 11 and then + Name_Buffer (3 .. 7) = Map_Array (J).Fname (1 .. 5)) + then Error_Msg_Strlen := Map_Array (J).Aname'Length; Error_Msg_String (1 .. Error_Msg_Strlen) := Map_Array (J).Aname.all; |