From: Ronan Desplanques <desplanques@adacore.com>
Date: Mon, 31 Oct 2022 17:08:37 +0000 (+0100)
Subject: ada: Fix non-capturing parentheses handling
X-Git-Tag: basepoints/gcc-14~3195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a2304a04925e43a50a345fb6a0b0c8ba180a973;p=thirdparty%2Fgcc.git

ada: Fix non-capturing parentheses handling

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.
---

diff --git a/gcc/ada/libgnat/s-regpat.adb b/gcc/ada/libgnat/s-regpat.adb
index 3290f9005447..3e9f880cd4e3 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