From f16d05d91391edb8da0ac0091c8576c8724f8cdc Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 7 Apr 2009 18:15:57 +0200 Subject: [multiple changes] 2009-04-07 Thomas Quinot * g-sothco.ads (Int_Access): Remove extraneous access type (use anonymous access instead). (Get_Socket_From_Set): Fix incorrectly reverted formals Last and Socket to match the underlying C routine. * g-socket.adb (Get): Use named parameter associations instead of positional ones in call go Get_Socket_From_Set, since this routine has two formals of the same type. * g-socthi-vms.adb, g-socthi-vms.ads, g-socthi-vxworks.adb, g-socthi-vxworks.ads, g-socthi-mingw.ads, g-socthi.adb, g-socthi.ads: (C_Ioctl, Syscall_Ioctl): use "access C.int" instead of "Int_Access" for type of Arg formal. * sem_warn.adb: Minor reformatting 2009-04-07 Ed Schonberg * sem_util.adb (Has_Tagged_Component): Fix typo in loop that iterates over record components. 2009-04-07 Nicolas Roche * gsocket.h: Don't include resolvLib.h on VxWorks 6 (kernel and rtp). This library has disappeared between VxWorks 6.4 and VxWorks 6.5 In RTP mode use time.h instead of times.h 2009-04-07 Robert Dewar * exp_ch4.adb (Expand_N_Op_Concat): Improve lower bound handling 2009-04-07 Kevin Pouget * exp_dist.adb: Modify Build_From_Any_Fonction procedure to correct expanded code for constrained types. 2009-04-07 Ed Schonberg * sem_ch4.adb (Analyze_Overloaded_Selected_Component): implement AI05-105: in an object renaming declaration, anonymousness is a name resolution rule. sem_ch8.adb (Analyze_Object_Renaming): Ditto. 2009-04-07 Arnaud Charlet * g-comlin.adb (Expansion): Fix old regression: also return directory names when matching. From-SVN: r145689 --- gcc/ada/g-comlin.adb | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'gcc/ada/g-comlin.adb') diff --git a/gcc/ada/g-comlin.adb b/gcc/ada/g-comlin.adb index b67d4fe..ba8ed16 100644 --- a/gcc/ada/g-comlin.adb +++ b/gcc/ada/g-comlin.adb @@ -263,24 +263,25 @@ package body GNAT.Command_Line is (It.Levels (Current).Dir, It.Dir_Name (1 .. NL)); end if; end if; + end if; - -- If not a directory, check the relative path against the pattern + -- Check the relative path against the pattern. + -- Note that we try to match also against directory names, since + -- clients of this function may expect to retrieve directories. - else - declare - Name : String := - It.Dir_Name (It.Start .. It.Levels (Current).Name_Last) - & S (1 .. Last); - begin - Canonical_Case_File_Name (Name); + declare + Name : String := + It.Dir_Name (It.Start .. It.Levels (Current).Name_Last) + & S (1 .. Last); + begin + Canonical_Case_File_Name (Name); - -- If it matches return the relative path + -- If it matches return the relative path - if GNAT.Regexp.Match (Name, Iterator.Regexp) then - return Name; - end if; - end; - end if; + if GNAT.Regexp.Match (Name, Iterator.Regexp) then + return Name; + end if; + end; end loop; end Expansion; -- cgit v1.1