regex: Fix bare OR not being properly grouped (fixes #3)

AntonLydike · Jul 12, 2024 · 1c374d1 · 1c374d1
1 parent 716e954
commit 1c374d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/filecheck/compiler.py b/filecheck/compiler.py
@@ -49,7 +49,12 @@ def compile_uops(
 
             # count number of capture groups by counting unescaped brackets
             groups += len(UNESCAPED_BRACKETS.findall(uop.content))
-            expr.append(uop.content)
+            # add brackets sorrounding patterns that contain ORs (fixes #3)
+            if "|" in uop.content:
+                expr.append(f"({uop.content})")
+                groups += 1
+            else:
+                expr.append(uop.content)
         elif isinstance(uop, Capture):
             # record the group we capture in the dictionary
             captures[uop.name] = (groups + 1, uop.value_mapper)

diff --git a/tests/filecheck/regex.test b/tests/filecheck/regex.test
@@ -11,3 +11,6 @@ test 123
 // CHECK: test [[VAR:[^ ,]+]]
 test 123, 123
 // CHECK: test [[VAR]], [[VAR]]
+
+test a b
+// CHECK: test {{a|b}} {{b|c}}