From 3fd9f17cdc0903732072cd64349ef14912d9cab0 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 18 Oct 2010 15:45:54 +0200 Subject: [multiple changes] 2010-10-18 Robert Dewar * einfo.ads, einfo.adb: Minor reformatting. * gnat_ugn.texi, ug_words: Add missing entries, fix typos. 2010-10-18 Emmanuel Briot * g-comlin.adb (Is_In_Config): When the switch accepts either a space or equal, we output an equal every time. 2010-10-18 Ed Schonberg * sem_res.adb (Resolve_Entry_Call): Handle call to an entry family member when pre/post conditions are present. * exp_ch9.adb (Build_PPC_Wrapper): The PPC_Wrapper for an entry family includes an index parameter, and the name of the enclosed entry call is an indexed component. From-SVN: r165634 --- gcc/ada/g-comlin.adb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gcc/ada/g-comlin.adb') diff --git a/gcc/ada/g-comlin.adb b/gcc/ada/g-comlin.adb index eb98696..eb7ebb4 100644 --- a/gcc/ada/g-comlin.adb +++ b/gcc/ada/g-comlin.adb @@ -1866,14 +1866,20 @@ package body GNAT.Command_Line is return False; end if; - when Parameter_With_Optional_Space - | Parameter_With_Space_Or_Equal => + when Parameter_With_Optional_Space => if Parameter /= "" then Callback (Switch, " ", Parameter, Index => Index); Found_In_Config := True; return False; end if; + when Parameter_With_Space_Or_Equal => + if Parameter /= "" then + Callback (Switch, "=", Parameter, Index => Index); + Found_In_Config := True; + return False; + end if; + when Parameter_No_Space => if Parameter /= "" then Callback (Switch, "", Parameter, Index); @@ -1925,8 +1931,9 @@ package body GNAT.Command_Line is null; when Parameter_With_Space_Or_Equal => - if Switch (Param) = ' ' - or else Switch (Param) = '=' + if Param <= Switch'Last + and then + (Switch (Param) = ' ' or else Switch (Param) = '=') then Callback (Switch (Switch'First .. Last), "=", Switch (Param + 1 .. Switch'Last), Index); -- cgit v1.1