From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 323A23832376 for ; Mon, 14 Nov 2022 13:52:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 323A23832376 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x32b.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so10737154wmb.2 for ; Mon, 14 Nov 2022 05:52:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7mqSHkesEQvstN364ZiVSiNxgXO0VsP6awfRTwpe/sM=; b=hvSul239287nWhMvlkZXVgpZ3zDfrkthD9MVA0zRcb1Tzdxseidygq9E7uw+k1qrEY YiRjJWOo7QeTXT3HwfVMshwIFbM8Ztmsvk1RYApDH477g/G7BCjzZFct3GBc4ZfKGprM Vd7LjmDV1KGU5uzDSasmBISiCHLUi95iPLYSp5YIBZ/Jb/c7tSROAud1VV4NIVZ6VgyN xwidb2Razp7NApnNZllsbNYEjZTtNqzVF80MH6He0kMOOk/KqG7lRgQmP+2za/XGGUwb FD6bh3OFWtVxpG9rxg+kjVz2pTMcncgMwL+BJgPe1LIJGGNpRWjQtkNuGF8f3t5MV3T2 J7kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7mqSHkesEQvstN364ZiVSiNxgXO0VsP6awfRTwpe/sM=; b=v8iSNNdQix/FETDW7Xz/67jpi7UvjRRIFN0/LxmYaAUiuYPJw/1Z8J/zSBOV/pJX5r 90yI5rRUyyHoSFWawR2TS1vNM8+DoNoL+av1emNmmuZuCA2r5Kw/0CWPzUtKxUH606Ik ExddbBnyOo3HjO+m9R4VHRBI+YFXZkz3KO9YcYHYRlq3YUJzhTN+W73FN34bnJ7WKLXc 7XQpZ0PuUfGjjWIujELE+6f68YDIrI2cwk2TAsC3bt4gcgQazIug2FWbZNv+K1ojItTW TVrJ4OD2UubwRnc+Xgo3cqvMp3cRSVLeBf72kufMWAMuSZJMHsJaRe+iqhvvNO6dY6vL EdYg== X-Gm-Message-State: ANoB5pn0URx4IlNhHoDKLb/bOu335mrwHIOVkwKqgvwYB6ZQMbR2iPQm YPfoH2n3rSVbtqUqs1Gj5WGIk5GdcvjYUw== X-Google-Smtp-Source: AA0mqf6JYSDkW199EVNwZxXQv0aUCLzTXtlNB75OISQIot4fGoD9FAIhv8YywwEDhB881nwbnJVn/g== X-Received: by 2002:a1c:f306:0:b0:3cf:c9b5:399f with SMTP id q6-20020a1cf306000000b003cfc9b5399fmr7759015wmq.48.1668433946585; Mon, 14 Nov 2022 05:52:26 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id az11-20020a05600c600b00b003b4cba4ef71sm19003622wmb.41.2022.11.14.05.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 05:52:26 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Ronan Desplanques Subject: [COMMITTED] ada: Fix non-capturing parentheses handling Date: Mon, 14 Nov 2022 14:52:24 +0100 Message-Id: <20221114135224.52966-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Ronan Desplanques Before this patch, non-capturingly parenthesized expressions with more than one branch were processed incorrectly when part of a branch followed by another branch. This patch fixes this by aligning the handling of non-capturing parentheses with the handling of regular parentheses. gcc/ada/ * libgnat/s-regpat.adb (Parse): Fix handling of non-capturing parentheses. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/s-regpat.adb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gcc/ada/libgnat/s-regpat.adb b/gcc/ada/libgnat/s-regpat.adb index 3290f900544..3e9f880cd4e 100644 --- a/gcc/ada/libgnat/s-regpat.adb +++ b/gcc/ada/libgnat/s-regpat.adb @@ -920,18 +920,16 @@ package body System.Regpat is if Capturing then Ender := Emit_Node (CLOSE); Emit (Character'Val (Par_No)); - Link_Tail (IP, Ender); - else - -- Need to keep looking after the closing parenthesis - Ender := Emit_Ptr; + Ender := Emit_Node (NOTHING); end if; else Ender := Emit_Node (EOP); - Link_Tail (IP, Ender); end if; + Link_Tail (IP, Ender); + if Have_Branch and then Emit_Ptr <= PM.Size + 1 then -- Hook the tails of the branches to the closing node -- 2.34.1