From a514465ca5f1f975985c28d1c9db03c111791671 Mon Sep 17 00:00:00 2001
From: Jozsef Marton <marton@db.bme.hu>
Date: Thu, 16 Aug 2018 08:05:02 +0200
Subject: [PATCH] Split StringListNullOperationExpression to specific parts.
 Ref. #321

Signed-off-by: Jozsef Marton <marton@db.bme.hu>
---
 grammar/basic-grammar.xml | 40 +++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/grammar/basic-grammar.xml b/grammar/basic-grammar.xml
index b7fba301e6..86d47bbdff 100644
--- a/grammar/basic-grammar.xml
+++ b/grammar/basic-grammar.xml
@@ -244,22 +244,38 @@
   <production name="StringListNullOperatorExpression" rr:inline="true">
     <non-terminal ref="PropertyOrLabelsExpression"/>
     <repeat><alt>
+      <non-terminal ref="StringOperatorExpression"/>
+      <non-terminal ref="ListOperatorExpression"/>
+      <non-terminal ref="NullOperatorExpression"/>
+    </alt></repeat>
+  </production>
+
+  <production name="ListOperatorExpression" rr:inline="true">
+    <alt>
       <seq> &WS; [ &expr; ] </seq>
       <seq> &WS; [ <opt>&expr;</opt> .. <opt>&expr;</opt> ] </seq>
-      <seq>
-        <alt>
-          <non-terminal ref="RegularExpression"/>
-          <seq>&SP; IN</seq>
-          <seq>&SP; STARTS &SP; WITH</seq>
-          <seq>&SP; ENDS &SP; WITH</seq>
-          <seq>&SP; CONTAINS</seq>
-        </alt>
-        &WS;
-        <non-terminal ref="PropertyOrLabelsExpression"/>
-      </seq>
+    </alt>
+  </production>
+
+  <production name="StringOperatorExpression" rr:inline="true">
+    <seq>
+      <alt>
+        <non-terminal ref="RegularExpression"/>
+        <seq>&SP; IN</seq>
+        <seq>&SP; STARTS &SP; WITH</seq>
+        <seq>&SP; ENDS &SP; WITH</seq>
+        <seq>&SP; CONTAINS</seq>
+      </alt>
+      &WS;
+      <non-terminal ref="PropertyOrLabelsExpression"/>
+    </seq>
+  </production>
+
+  <production name="NullOperatorExpression" rr:inline="true">
+    <alt>
       <seq> &SP; IS &SP; NULL </seq>
       <seq> &SP; IS &SP; NOT &SP; NULL </seq>
-    </alt></repeat>
+    </alt>
   </production>
 
   <production name="RegularExpression" oc:legacy="true">