From patchwork Tue May 23 08:09:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 97866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1977150vqo; Tue, 23 May 2023 01:19:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6uy+bYMfi9RbM840/A7uA/rHMEcP2ePOOZ+fT4GV9M/NUDKGw5ZoC+3p5mI+JTyngFZBUQ X-Received: by 2002:a05:6402:3c4:b0:50d:9058:733 with SMTP id t4-20020a05640203c400b0050d90580733mr13157961edw.18.1684829960541; Tue, 23 May 2023 01:19:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684829960; cv=none; d=google.com; s=arc-20160816; b=ElACkYChkzAfN1V33aGT8GHVpMn0Xj7WaGsoNtXgXrzsGGCXPQuEgMha4ckRW4lmM4 A8M1t4OpVTwhTqCFhQFXSbICqBn3x2DB1fp/hV2uc9BzoyytVxzrxQstzlBE9KBCPqwV XGk6Ig51q1SDJldSYMqCRz+lptpikaKOTa+W0e+kXOE3hfYLtb7FUQ29qySpeG2eo86W ENsWxEDSZP/CZBdsO4ppF805a1BPcHnXA2AsCKaOL9wJqmbqcchGUUv4UeuCbpO0F0CQ fpTRSq8EcyCt392W4SMaMLVK/3GqzSgY+PIVBl/GFhGN1U7XIbE3fiRL/8p14hcOao22 UwhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=7mWzoVFAbNwZZbwZyRq8ZatQKFJZJLM3jCZLeUMSAJs=; b=VC/xc8NntFVZm7+HKlusDf7WUWmVkLNf3JPhq/gLoEzsPOYJ26hdgYOORZJ7uuilxN VLEkt094WyK4JILJTtF69jloVC/5f5YCPP7UnpGJ3bDShhUHboLEfyfu3nyII6JJksil vcvnayPeXcgLm+g/zyBxxVvskQ2dfzXoHy+fbptJiL0RyYlQ/K3tG0CWp3W3J3ssQjsM QTSX5Aj4ju71HJkYc4+sYHQ1+TTbgPTX++7OARhcwU7yzSMZ0aXUX9VpDZVjswMbckHu UtLDkXOA1LoLEgUn7CzsUxbBjltWdXacyphpRhv+VEXE7rZl6QhW4SNQfYCnbMzh/QUw pWFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=rhB1PwV7; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id c26-20020aa7c75a000000b0050bcb5686e3si494609eds.411.2023.05.23.01.19.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:19:20 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=rhB1PwV7; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3FB5E3952538 for ; Tue, 23 May 2023 08:13:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3FB5E3952538 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684829581; bh=7mWzoVFAbNwZZbwZyRq8ZatQKFJZJLM3jCZLeUMSAJs=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=rhB1PwV7PrDV0jdjEPLrNAr0pqtm3ZynG2H4myNmP7i0jOL//Yq7modoZk2QTMpa3 Qa3bb6b0FvxV3x0E6QvJe8h8py9Lw0TMUT2B1VoD0A8CbbaF+dunYKuTJ20kwm+Llw Avw9/8CYTbq+zyVinSz0BW9X4dAbSLy2uauDGFgE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id DB28F38323D0 for ; Tue, 23 May 2023 08:09:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB28F38323D0 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f50020e0f8so30151765e9.0 for ; Tue, 23 May 2023 01:09:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684829347; x=1687421347; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7mWzoVFAbNwZZbwZyRq8ZatQKFJZJLM3jCZLeUMSAJs=; b=GcCr0LgsUAPWG3Xd6cnMi5fJmqyIoSvHt/VTY4dOjxSrs2FL24hX+6ShyeFWg83V2t z9dudVkpuwAiSN83ZL+Y64biTCTk2fMcuRPEAZ3rSOILIkpMdQHfY1fKobDVvSd90YEc o/vyrdbKwDarxctjcM+jbsSUxI7qu6SMnvlBwJCxnL4XYeXhifsFZgQod479wesQOoxC Xf35TE5IHMR9v2nHn2cyCc93QZiXR4u3YWBmtIxNpCoQNmlOUn7SdVgcr5ITbD3Vrx/0 q40rGa5wBAB1yzEGE4sI5IC1eEekxhr/BVcOLKLmMvOlVtRMZIwGfTr/6CT/Vlan/GF/ aYgA== X-Gm-Message-State: AC+VfDxDaE7z/Kx2J8nMof8XIoRY14DAAwWq4A+0b7yOfCQbZ8O9UG+K sg3EYjnpLu1kkr/BOhVy3jfwDb9H84usr5NXd23R5Q== X-Received: by 2002:a7b:cbc9:0:b0:3f6:84:3df6 with SMTP id n9-20020a7bcbc9000000b003f600843df6mr6158966wmi.10.1684829347735; Tue, 23 May 2023 01:09:07 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id t20-20020a1c7714000000b003f606869603sm4542402wmi.6.2023.05.23.01.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:09:07 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Raphael Amiard Subject: [COMMITTED] ada: Make string interpolation part of the core extensions Date: Tue, 23 May 2023 10:09:06 +0200 Message-Id: <20230523080906.1874606-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766672260412879679?= X-GMAIL-MSGID: =?utf-8?q?1766672260412879679?= From: Raphael Amiard gcc/ada/ * scng.adb (Scan): Replace occurrences of All_Extensions_Allowed by Core_Extensions_Allowed. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/scng.adb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb index d1230e2efe1..abf9c68cd3d 100644 --- a/gcc/ada/scng.adb +++ b/gcc/ada/scng.adb @@ -1527,10 +1527,10 @@ package body Scng is end if; -- Left curly bracket, treated as right paren but proper delimiter - -- of interpolated string literals when all extensions are allowed. + -- of interpolated string literals when core extensions are allowed. when '{' => - if All_Extensions_Allowed then + if Core_Extensions_Allowed then Scan_Ptr := Scan_Ptr + 1; Token := Tok_Left_Curly_Bracket; @@ -1962,10 +1962,10 @@ package body Scng is return; -- Right curly bracket, treated as right paren but proper delimiter - -- of interpolated string literals when all extensions are allowed. + -- of interpolated string literals when core extensions are allowed. when '}' => - if All_Extensions_Allowed then + if Core_Extensions_Allowed then Token := Tok_Right_Curly_Bracket; else @@ -2125,7 +2125,7 @@ package body Scng is -- Lower case letters when 'a' .. 'z' => - if All_Extensions_Allowed + if Core_Extensions_Allowed and then Source (Scan_Ptr) = 'f' and then Source (Scan_Ptr + 1) = '"' then @@ -2145,7 +2145,7 @@ package body Scng is -- Upper case letters when 'A' .. 'Z' => - if All_Extensions_Allowed + if Core_Extensions_Allowed and then Source (Scan_Ptr) = 'F' and then Source (Scan_Ptr + 1) = '"' then