From patchwork Mon Jun 14 13:33:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 55530 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 C8404B7D1C for ; Mon, 14 Jun 2010 23:33:03 +1000 (EST) Received: (qmail 24364 invoked by alias); 14 Jun 2010 13:33:01 -0000 Received: (qmail 24353 invoked by uid 22791); 14 Jun 2010 13:33:00 -0000 X-SWARE-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL, BAYES_20, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (212.99.106.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jun 2010 13:32:55 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 2FD29CB0225; Mon, 14 Jun 2010 15:32:59 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j5LIXS2mksqD; Mon, 14 Jun 2010 15:32:59 +0200 (CEST) Received: from saumur.act-europe.fr (saumur.act-europe.fr [10.10.0.183]) by mel.act-europe.fr (Postfix) with ESMTP id 18FDECB0219; Mon, 14 Jun 2010 15:32:59 +0200 (CEST) Received: by saumur.act-europe.fr (Postfix, from userid 525) id 40C4AD9B31; Mon, 14 Jun 2010 15:33:06 +0200 (CEST) Date: Mon, 14 Jun 2010 15:33:06 +0200 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Robert A Duff Subject: [Ada] overriding indicator in subunit Message-ID: <20100614133306.GA11539@adacore.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.9i X-IsSubscribed: yes 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 The parser did not correctly recognize "overriding" and "not overriding" in a subunit. The following test should compile silently. package Subunits is type T is null record; not overriding procedure Not_Overriding (X : T); end Subunits; package body Subunits is not overriding procedure Not_Overriding (X : T) is separate; end Subunits; separate (Subunits) not overriding procedure Not_Overriding (X : T) is begin null; end Not_Overriding; Tested on x86_64-pc-linux-gnu, committed on trunk 2010-06-14 Bob Duff * par-ch10.adb (P_Subunit): If the next token after "separate(X)" is Tok_Not or Tok_Overriding, call P_Subprogram. We had previously given the incorrect error "proper body expected". * par-ch6.adb (P_Subprogram): Suppress "overriding indicator not allowed here" error in case of subunits, which was triggered by the above change to P_Subunit. Index: par-ch6.adb =================================================================== --- par-ch6.adb (revision 160705) +++ par-ch6.adb (working copy) @@ -215,14 +215,17 @@ package body Ch6 is -- already been given, so no need to give another message here. -- An overriding indicator is allowed for subprogram declarations, - -- bodies, renamings, stubs, and instantiations. The test against - -- Pf_Decl_Pbod is added to account for the case of subprograms - -- declared in a protected type, where only subprogram declarations - -- and bodies can occur. + -- bodies (including subunits), renamings, stubs, and + -- instantiations. The test against Pf_Decl_Pbod is added to account + -- for the case of subprograms declared in a protected type, where + -- only subprogram declarations and bodies can occur. The Pf_Pbod + -- case is for subunits. if Pf_Flags /= Pf_Decl_Gins_Pbod_Rnam_Stub and then Pf_Flags /= Pf_Decl_Pbod + and then + Pf_Flags /= Pf_Pbod then Error_Msg_SC ("overriding indicator not allowed here!"); Index: par-ch10.adb =================================================================== --- par-ch10.adb (revision 160705) +++ par-ch10.adb (working copy) @@ -1028,7 +1028,11 @@ package body Ch10 is Ignore (Tok_Semicolon); - if Token = Tok_Function or else Token = Tok_Procedure then + if Token = Tok_Function + or else Token = Tok_Not + or else Token = Tok_Overriding + or else Token = Tok_Procedure + then Body_Node := P_Subprogram (Pf_Pbod); elsif Token = Tok_Package then