From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 77CAE38A941F; Tue, 11 Jan 2022 13:28:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 77CAE38A941F MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6470] [Ada] Accept square brackets for expression functions X-Act-Checkin: gcc X-Git-Author: Etienne Servais X-Git-Refname: refs/heads/master X-Git-Oldrev: 1be42e5907524af490afdec8ff2e200e69bfa8aa X-Git-Newrev: 805655c137088519751e4ca18df722355a512d88 Message-Id: <20220111132836.77CAE38A941F@sourceware.org> Date: Tue, 11 Jan 2022 13:28:36 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jan 2022 13:28:36 -0000 https://gcc.gnu.org/g:805655c137088519751e4ca18df722355a512d88 commit r12-6470-g805655c137088519751e4ca18df722355a512d88 Author: Etienne Servais Date: Mon Jan 3 14:41:58 2022 +0100 [Ada] Accept square brackets for expression functions gcc/ada/ * par-ch6.adb (Scan_Body_Or_Expression_Function): Accept left bracket as token to open an expression function. Diff: --- gcc/ada/par-ch6.adb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb index 1b3cf94af5c..d972eadbda5 100644 --- a/gcc/ada/par-ch6.adb +++ b/gcc/ada/par-ch6.adb @@ -841,7 +841,14 @@ package body Ch6 is begin -- Expression_Function case - if Token = Tok_Left_Paren + -- If likely an aggregate, check we are in Ada 2022 mode + + if Token = Tok_Left_Bracket then + Error_Msg_Ada_2022_Feature + ("!aggregates as expression function", Token_Ptr); + end if; + + if Token in Tok_Left_Paren | Tok_Left_Bracket or else Likely_Expression_Function then -- Check expression function allowed here