FIX: CQL now treats 'WITH` and `WITH A` equivalently. For #192.

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed ###
 
+- CQL now treats `WITH` and `WITH A` equivalently. This is for [#192](https://gitlab.com/caosdb/caosdb-server/-/issues/192).
+
 ### Deprecated ###
 
 ### Removed ###

src/main/java/org/caosdb/server/query/CQLLexer.g4

@@ -277,10 +277,6 @@ NEGATION:
     ) WHITE_SPACE_f?
 ;
 
-WITH:
-    [Ww][Ii][Tt][Hh] WHITE_SPACE_f?
-;
-
 THE:
     [Tt][Hh][Ee] WHITE_SPACE_f?
 ;
@@ -309,6 +305,10 @@ ELSE:
     [Ee][Ll][Ss][Ee] WHITE_SPACE_f?
 ;
 
+WITH_A:
+    [Ww][Ii][Tt][Hh] (WHITE_SPACE_f? A)? WHITE_SPACE_f?
+;
+
 WHERE:
     [Ww][Hh][Ee][Rr][Ee] WHITE_SPACE_f?
 ;

src/main/java/org/caosdb/server/query/CQLParser.g4

@@ -129,7 +129,7 @@ entity_filter returns [EntityFilterInterface filter]
 which_exp:
     WHICH (HAS_A (PROPERTY)?)?
     | HAS_A (PROPERTY)?
-    | WITH (A (PROPERTY)?)?
+    | WITH_A (PROPERTY)?
     | WHERE
     | DOT WHITE_SPACE?
 ;
@@ -527,7 +527,7 @@ number_with_unit
 
 unit
 :
-    (~(WHITE_SPACE | WHICH | HAS_A | WITH | WHERE | DOT | AND | OR | RPAREN ))
+    (~(WHITE_SPACE | WHICH | HAS_A | WITH_A | WHERE | DOT | AND | OR | RPAREN ))
     (~(WHITE_SPACE))*
     |
     NUM SLASH (~(WHITE_SPACE))+