From patchwork Thu Sep 7 09:33:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 810936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-461666-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="lxIJytBI"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xnwJ36Zjhz9sRV for ; Thu, 7 Sep 2017 19:33:54 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=xHzgCI1WUCz+pf4ZqcAutTOKGddQmLwU+G7SeZEv6CAO4huMF4 KBB/fQZSE0TXDcO8UKwjzJgg6GEgji8rBLXlEkdlZ/JhchsuiixFTzmHWVtoE0mt 6IpuaAMLSmlF8mZNpg4QxktjpkATs6LtW8Q+TbPdaAAeXSLLVoll8SwW8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=K1lcPgU46CYlhxq1seloLzqlceE=; b=lxIJytBINoaCabfOShhT B4k3t715ooLVy/Te88w5BgsZXesa9CDLfWiuFEyjwPsOhRLNpjtRN1WmKjvrK7Zn FQ1ekaRIZ5PTb5CqQDCU2vPVGPiyTLeS0KsutS0Hb889A3LlCiWfWYV86rrWHWOd S+OUderVkxIiItDs0O5adyY= Received: (qmail 87864 invoked by alias); 7 Sep 2017 09:33:45 -0000 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 Received: (qmail 87053 invoked by uid 89); 7 Sep 2017 09:33:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=spite, 84412 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 07 Sep 2017 09:33:38 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 346E4561AA; Thu, 7 Sep 2017 05:33:36 -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 8L2ZpdLpLqrZ; Thu, 7 Sep 2017 05:33:36 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 21D13561A2; Thu, 7 Sep 2017 05:33:36 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id 1DFDD4FC; Thu, 7 Sep 2017 05:33:36 -0400 (EDT) Date: Thu, 7 Sep 2017 05:33:36 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Improved error message on malformed null procedure with aspect Message-ID: <20170907093336.GA75027@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) This patch improve the error reporting on a null procedure with misplaced aspect specification, which the parser first attempts to interpret as a malformed expression function, in spite of the initial keyword in the declaration. Compiling --- package Null_Proc_With_Contract is procedure Proc with Global => null is null; end; --- must yield: null_proc_with_contract.ads:2:28: aspect specifications must come after subprogram specification Tested on x86_64-pc-linux-gnu, committed on trunk 2017-09-07 Ed Schonberg * par-ch6.adb (P_Subprogram): Improve error message on null procedure with misplaced aspect specification, which the parser first attempts to interpret as a malformed expression function. Index: par-ch6.adb =================================================================== --- par-ch6.adb (revision 251753) +++ par-ch6.adb (working copy) @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2016, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2017, 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- -- @@ -810,10 +810,15 @@ end if; end if; - -- Fall through if we have a likely expression function + -- Fall through if we have a likely expression function. + -- If the starting keyword is not "function" the error + -- will be reported elsewhere. - Error_Msg_SC - ("expression function must be enclosed in parentheses"); + if Func then + Error_Msg_SC + ("expression function must be enclosed in parentheses"); + end if; + return True; end Likely_Expression_Function; @@ -844,12 +849,20 @@ -- This case is correctly processed by the parser because -- the expression function first appears as a subprogram - -- declaration to the parser. + -- declaration to the parser. The starting keyword may + -- not have been "function" in which case the error is + -- on a malformed procedure. if Is_Non_Empty_List (Aspects) then - Error_Msg - ("aspect specifications must come after parenthesized " - & "expression", Sloc (First (Aspects))); + if Func then + Error_Msg ("aspect specifications must come after " + & "parenthesized expression", + Sloc (First (Aspects))); + else + Error_Msg ("aspect specifications must come after " + & "subprogram specification", + Sloc (First (Aspects))); + end if; end if; -- Parse out expression and build expression function