diff mbox series

[COMMITTED] ada: Fix non-capturing parentheses handling

Message ID 20221114135224.52966-1-poulhies@adacore.com
State Committed
Commit 0a2304a04925e43a50a345fb6a0b0c8ba180a973
Headers
Series [COMMITTED] ada: Fix non-capturing parentheses handling |

Commit Message

Marc Poulhiès Nov. 14, 2022, 1:52 p.m. UTC 
  From: Ronan Desplanques <desplanques@adacore.com>

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 mbox series

Patch

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