From patchwork Tue Oct 15 10:33:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 283573 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6A5EA2C0143 for ; Tue, 15 Oct 2013 21:33:59 +1100 (EST) 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=nbTXadMtfWli1DbagGgYexkmzyf9O2DoOk9mS78dIZ5ZbB/hhL 7hdibrcQQcb5/6FDaF+0Ioltw6bO7aoVnn4npqxMDoBHFrmFewDIBOp1LBERRSf2 23Y/e8HTZ5tJPUnqmZGCY8gObfhp/9UzFoghL8Vtuc93DAIpvvLk13tqU= 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=rBF7ms/IRK8yANU8duuWqYkYlIg=; b=W4qKtoICizKAmyhot6Dn HO8UME8L/xySaq4/3wWWWz9Qsgno7+ia/2bqG3Qo0QMoYKjZ8WW5xo0+S5idG6lV xBEK9hCi2kEF61DqKwxbcqgAtfVPWwmHo+MdM0MUFX45F0BS5uiOQXWIC1F+IE29 bTq8+V8VzA+4ys5knjTKbWA= Received: (qmail 16517 invoked by alias); 15 Oct 2013 10:33:53 -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 16504 invoked by uid 89); 15 Oct 2013 10:33:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 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 (AES256-SHA encrypted) ESMTPS; Tue, 15 Oct 2013 10:33:51 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 8578F11639B; Tue, 15 Oct 2013 06:34:12 -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 XWz3bHZI+brg; Tue, 15 Oct 2013 06:34:12 -0400 (EDT) Received: from kwai.gnat.com (unknown [IPv6:2620:20:4000:0:a6ba:dbff:fe26:1f63]) by rock.gnat.com (Postfix) with ESMTP id 74C3611634C; Tue, 15 Oct 2013 06:34:12 -0400 (EDT) Received: by kwai.gnat.com (Postfix, from userid 4192) id D52BB3FB31; Tue, 15 Oct 2013 06:33:49 -0400 (EDT) Date: Tue, 15 Oct 2013 06:33:49 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Robert Dewar Subject: [Ada] Give better msg for redundant ELSE in IF EXPRESSION Message-ID: <20131015103349.GA19243@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) We now give a better message for a redundant ELSE part in an IF expression. 1. package Elseelse is 2. function F return Boolean is 3. (if 1 + 1 = 2 then True 4. else False 5. else True); | >>> only one "else" part is allowed 6. function F2 return Boolean is 7. (if 1 + 1 = 2 then True 8. else False 9. else True | >>> only one "else" part is allowed 10. else False); | >>> only one "else" part is allowed 11. end Elseelse; Tested on x86_64-pc-linux-gnu, committed on trunk 2013-10-15 Robert Dewar * par-ch4.adb (P_If_expression): Handle redundant ELSE cleanly. Index: par-ch4.adb =================================================================== --- par-ch4.adb (revision 203568) +++ par-ch4.adb (working copy) @@ -3120,6 +3120,14 @@ Scan; -- Past ELSE Append_To (Exprs, P_Expression); + -- Skip redundant ELSE parts + + while Token = Tok_Else loop + Error_Msg_SC ("only one ELSE part is allowed"); + Scan; -- past ELSE + Discard_Junk_Node (P_Expression); + end loop; + -- Two expression case (implied True, filled in during semantics) else