From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 79CF6397303B for ; Tue, 4 May 2021 09:52:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 79CF6397303B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 31E4F5613F; Tue, 4 May 2021 05:52:23 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com 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 b8uxX3VEjlmV; Tue, 4 May 2021 05:52:23 -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 0FF7A56138; Tue, 4 May 2021 05:52:23 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 0F48316E; Tue, 4 May 2021 05:52:23 -0400 (EDT) Date: Tue, 4 May 2021 05:52:23 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [Ada] Minor tweak in pretty-printing of expressions Message-ID: <20210504095223.GA90530@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="zYM0uCDKw75PZbzx" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2021 09:52:28 -0000 --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Printing of expressions is used in GNATprove to display parts of an assertion which are not proved, Here the printing is improved slightly for an expression-with-actions, so that the underlying expression is printed, instead of the corresponding AST form of the expression with Expr_Name. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * pprint.adb (Expression_Image): Special case for expression-with-actions. --zYM0uCDKw75PZbzx Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/pprint.adb b/gcc/ada/pprint.adb --- a/gcc/ada/pprint.adb +++ b/gcc/ada/pprint.adb @@ -682,7 +682,7 @@ package body Pprint is end case; end Expr_Name; - -- Start of processing for Expression_Name + -- Start of processing for Expression_Image begin if not From_Source then @@ -697,6 +697,12 @@ package body Pprint is end; end if; + -- Reach to the underlying expression for an expression-with-actions + + if Nkind (Expr) = N_Expression_With_Actions then + return Expression_Image (Expression (Expr), Default); + end if; + -- Compute left (start) and right (end) slocs for the expression -- Consider using Sinput.Sloc_Range instead, except that it does not -- work properly currently??? --zYM0uCDKw75PZbzx--