Fix enum conflict with domain string and more conditional expression …

…flexibility
1R053 · Dec 31, 2019 · 7cbb9a6 · 7cbb9a6
1 parent a915ae6
commit 7cbb9a6
Show file tree

Hide file tree

Showing 4 changed files with 1,700 additions and 1,710 deletions.
diff --git a/ABAPCDS.g4 b/ABAPCDS.g4
@@ -157,7 +157,7 @@ projection
     ;
 
 domain_string
-    : '#' IDENTIFIER '.' STRING
+    : ENUM '.' ( STRING )
     ;
 
 rel_side
@@ -177,9 +177,9 @@ rel_expr
 cond_expr
     : rel_expr
     | NOT rel_expr
-    | rel_expr ((AND|OR) rel_expr)+
+    | rel_expr ((AND | OR) cond_expr)+
     | '(' cond_expr ')'
-    | '(' cond_expr ((AND|OR) cond_expr)+ ')'
+    | '(' cond_expr ((AND | OR) cond_expr)+ ')'
     ;
 
 min_max_clause