Merge pull request #6308 from tomachalek/supp2950

Fix - must use proper aliases for constants, ...
czcorpus · Sep 27, 2024 · 9b04770 · 9b04770
2 parents 95fc181 + 82691f2
commit 9b04770
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/build/cql.pegjs b/scripts/build/cql.pegjs
@@ -131,13 +131,13 @@ NO_RG_ESCAPED =
 // ---------------- Regular expression with balanced parentheses --------
 
 RegExp =
-    QUOT RegExpRaw ("|" RegExpRaw?)* QUOT / QUOT QUOT
+    QUOT RegExpRaw (BINOR RegExpRaw?)* QUOT / QUOT QUOT
 
 RegExpRaw =
     (RgLook / RgGrouped / RgSimple)+
 
 RgGrouped =
-    LPAREN _ RegExpRaw ("|" RegExpRaw?)*  _ RPAREN
+    LPAREN _ RegExpRaw (BINOR RegExpRaw?)*  _ RPAREN
 
 RgSimple =
     (RgRange / RgChar / RgAlt / RgPosixClass)+
@@ -157,9 +157,9 @@ RgAlt =
     LBRACKET RG_CARET? RgAltVal+ RBRACKET
 
 RgAltVal =
-    AnyLetter "-" AnyLetter /
+    AnyLetter DASH AnyLetter /
     RgChar /
-    "|" /
+    BINOR /
     QUOT /
     LBRACE /
     RBRACE /