commit e1020e8ac22265e889346fe380d1e6dafb9bc0e9
author margaretha <margaretha@ids-mannheim.de> Fri Jan 07 09:02:01 2022 +0100
committer margaretha <margaretha@ids-mannheim.de> Mon Jan 10 16:44:08 2022 +0100
tree f6e88eccff28a3cab75c2550eece686cd2c9077b
parent 43dd246abc69367eb117ddc4d7e68491a40cdd29

Fixed Annis OR group (resolved #96)

Change-Id: I495c02cee0350315550420b5aa14cbc37e7b5b50

src/main/antlr/annis/AqlLexer.g4

diff --git a/src/main/antlr/annis/AqlLexer.g4 b/src/main/antlr/annis/AqlLexer.g4
index 5b9da30..8fda46b 100644
--- a/src/main/antlr/annis/AqlLexer.g4
+++ b/src/main/antlr/annis/AqlLexer.g4
@@ -80,8 +80,12 @@
 fragment RE_star     : (RE_char | RE_chgroup | ( '(' REGEX ')')) '*';
 fragment RE_plus     : (RE_char | RE_chgroup | ( '(' REGEX ')')) '+';
 fragment RE_occ      : (RE_char | RE_chgroup | ( '(' REGEX ')')) FOCC;
+fragment RE_expr     : '.' | RE_char | RE_alter | RE_chgroup | RE_opt | RE_quant;
+fragment RE_orgroup  : '(' RE_expr* ('|' RE_expr+ )* ')' ;
 fragment RE_group    : '(' REGEX ')';
-REGEX     		     : SLASH ('.' | RE_char | RE_alter | RE_chgroup | RE_opt | RE_quant | RE_group)* SLASH;
+//REGEX     		     : SLASH ('.' | RE_char | RE_alter | RE_chgroup | RE_opt | RE_quant | RE_group)* SLASH;
+
+REGEX     		     : SLASH (RE_expr | RE_group | RE_orgroup)* SLASH;
 
 
 WS : ( ' ' | '\t' | '\r' | '\n' )+ -> skip ;

src/main/antlr/annis/AqlParser.g4

diff --git a/src/main/antlr/annis/AqlParser.g4 b/src/main/antlr/annis/AqlParser.g4
index f26eb9b..5718a77 100644
--- a/src/main/antlr/annis/AqlParser.g4
+++ b/src/main/antlr/annis/AqlParser.g4
@@ -191,5 +191,5 @@
 
 
 exprTop
-: andTopExpr (OR andTopExpr)* # OrTop
+: BRACE_OPEN? andTopExpr (OR andTopExpr)* BRACE_CLOSE? # OrTop
 ;
\ No newline at end of file