From patchwork Mon Oct 1 08:20:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 188235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 754A72C00E5 for ; Mon, 1 Oct 2012 18:20:59 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1349684459; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc:Subject:Message-ID: MIME-Version:Content-Type:Content-Disposition:User-Agent: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=6VYNfHCZUYV9a5QdYw8a UVv1WgA=; b=OrKui9aUV9VWICQkY7f4aivF9G+QUk6DyR4rrBrTMXRPSMABB2fU zKjeH2gCxij9sDPGgL2u3BvOFnkXotpOPp2bnPPGSaVYclQ3aHyh57w8bQcM89vN 3yOvLyFjBE+y5UXW3WkAMbpwjIm+sBeneNSWeYvG9j1D9RBQx8+XpWg= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=G8ca6FNVsvpWXwnOzEbS9hf93l0GSGiTazQMq7icTtwMY+aG7Iw7LaAM2Uz8VW Vgn4dvXtXXU7N7ONYrPQANZfk6znmDLfQKjki/TW0Guk4jPTruBcl7sRL/dVEtT1 D2mzE4As3RPcD7/z/06Y02wWzJ/w5ipnAwiEH3ydHog4g=; Received: (qmail 28231 invoked by alias); 1 Oct 2012 08:20:50 -0000 Received: (qmail 28220 invoked by uid 22791); 1 Oct 2012 08:20:47 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_NO, TW_RG X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 01 Oct 2012 08:20:41 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 8346A1C73A8; Mon, 1 Oct 2012 04:20:40 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id GzxsBKu6zfm2; Mon, 1 Oct 2012 04:20:40 -0400 (EDT) Received: from kwai.gnat.com (kwai.gnat.com [205.232.38.4]) by rock.gnat.com (Postfix) with ESMTP id 5C6B31C7362; Mon, 1 Oct 2012 04:20:40 -0400 (EDT) Received: by kwai.gnat.com (Postfix, from userid 4192) id 586C73FF09; Mon, 1 Oct 2012 04:20:40 -0400 (EDT) Date: Mon, 1 Oct 2012 04:20:40 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Thomas Quinot Subject: [Ada] Handling of -vPx with incorrect x Message-ID: <20121001082040.GA24257@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Command line switch -vPx (set verbosity level for project file facility) in gnatmake and gnatcmd is is valid only for x=0, 1, or 2. This change ensures that any attempt to pass an invalid value generates a proper error message. The following commands must generate the indicated errors: $ gnat list -vP9 -Pinvalid_verbosity_prj invalid_verbosity_proc.adb gnat: invalid verbosity level: 9 $ gnat compile -q -vP9 -Pinvalid_verbosity_prj invalid_verbosity_proc.adb gnatmake: invalid verbosity level 9 $ gnatmake -q -vP9 -Pinvalid_verbosity_prj invalid_verbosity_proc.adb gnatmake: invalid verbosity level 9 project invalid_verbosity_prj is end invalid_verbosity_prj; procedure invalid_verbosity_proc is end invalid_verbosity_proc; Tested on x86_64-pc-linux-gnu, committed on trunk 2012-10-01 Thomas Quinot * gnatcmd.adb, make.adb (Scan_Make_Arg, Inspect_Switches): Recognize and reject an invalid parameter passed to -vP. Index: gnatcmd.adb =================================================================== --- gnatcmd.adb (revision 191888) +++ gnatcmd.adb (working copy) @@ -1769,20 +1769,28 @@ -- -vPx Specify verbosity while parsing project files - elsif Argv'Length = 4 - and then Argv (Argv'First + 1 .. Argv'First + 2) = "vP" - then - case Argv (Argv'Last) is - when '0' => - Current_Verbosity := Prj.Default; - when '1' => - Current_Verbosity := Prj.Medium; - when '2' => - Current_Verbosity := Prj.High; - when others => - Fail ("Invalid switch: " & Argv.all); - end case; + elsif Argv (Argv'First + 1 .. Argv'First + 2) = "vP" then + if Argv'Length = 4 + and then Argv (Argv'Last) in '0' .. '2' + then + case Argv (Argv'Last) is + when '0' => + Current_Verbosity := Prj.Default; + when '1' => + Current_Verbosity := Prj.Medium; + when '2' => + Current_Verbosity := Prj.High; + when others => + -- Cannot happen + + raise Program_Error; + end case; + else + Fail ("invalid verbosity level: " + & Argv (Argv'First + 3 .. Argv'Last)); + end if; + Remove_Switch (Arg_Num); -- -Pproject_file Specify project file to be used Index: make.adb =================================================================== --- make.adb (revision 191890) +++ make.adb (working copy) @@ -7825,11 +7825,12 @@ -- -vPx (verbosity of the parsing of the project files) - elsif Argv'Last = 4 - and then Argv (2 .. 3) = "vP" - and then Argv (4) in '0' .. '2' - then - if And_Save then + elsif Argv (2 .. 3) = "vP" then + if Argv'Last /= 4 or else Argv (4) not in '0' .. '2' then + Make_Failed + ("invalid verbosity level " & Argv (4 .. Argv'Last)); + + elsif And_Save then case Argv (4) is when '0' => Current_Verbosity := Prj.Default;