a working version

Author: pwwpche

Cypher.g4

@@ -1,93 +1,80 @@
 grammar Cypher;
 
-cypher : SP? statement ( SP? ';' )? SP? ;
+cypher :  singleQuery (  ';' )?  ;
 
-statement : singleQuery ;
-
-singleQuery : clause ( SP? clause )* ;
+singleQuery : clause (  clause )* ;
 
 clause : match
        | return1
        ;
 
-match : MATCH SP? pattern ( SP? where )? ;
-
-return1 : RETURN SP returnBody ;
-
-returnBody : returnItems  ;
-
-returnItems : ( ( SP? ',' SP? returnItem )* )
-            | ( returnItem ( SP? ',' SP? returnItem )* )
-            ;
-
-returnItem : expression
-           ;
+match : MATCH  pattern (  WHERE  expression )? ;
 
-where : WHERE SP expression ;
+return1 : RETURN  ( expression (  ','  expression )* )  ;
 
-pattern : patternPart ( SP? ',' SP? patternPart )* ;
+pattern : patternPart (  ','  patternPart )* ;
 
-patternPart : ( variable SP? '=' SP? anonymousPatternPart )
-            | anonymousPatternPart
+patternPart : ( variable  '='  patternElement )
+            | patternElement
             ;
 
-anonymousPatternPart : patternElement ;
-
-patternElement : ( nodePattern ( SP? patternElementChain )* )
+patternElement : ( nodePattern (  patternElementChain )* )
                | ( '(' patternElement ')' )
                ;
 
-nodePattern : '(' SP? ( variable SP? )? ( nodeLabels SP? )? ( properties SP? )? ')' ;
+patternElementChain : relationshipPattern  nodePattern ;
 
-patternElementChain : relationshipPattern SP? nodePattern ;
+nodePattern : '('  ( variable  )? ( nodeLabels  )? ( properties  )? ')' ;
 
-relationshipPattern : ( leftArrowHead SP? dash SP? relationshipDetail? SP? dash SP? rightArrowHead )
-                    | ( leftArrowHead SP? dash SP? relationshipDetail? SP? dash )
-                    | ( dash SP? relationshipDetail? SP? dash SP? rightArrowHead )
-                    | ( dash SP? relationshipDetail? SP? dash )
+relationshipPattern : ( leftArrowHead  dash  relationshipDetail?  dash  rightArrowHead )
+                    | ( leftArrowHead  dash  relationshipDetail?  dash )
+                    | ( dash  relationshipDetail?  dash  rightArrowHead )
+                    | ( dash  relationshipDetail?  dash )
                     ;
 
-relationshipDetail : '[' SP? ( variable SP? )? ( relationshipTypes SP? )? rangeLiteral? ( properties SP? )? ']' ;
+relationshipDetail : '['  ( variable  )? ( relationshipTypes  )? rangeLiteral? ( properties  )? ']' ;
 
 properties : mapLiteral
-           | parameter
            ;
 
-relationshipTypes : ':' SP? relTypeName ( SP? '|' ':'? SP? relTypeName )* ;
+relationshipTypes : ':'  relTypeName (  '|' ':'?  relTypeName )* ;
 
-nodeLabels : nodeLabel ( SP? nodeLabel )* ;
+nodeLabels : (':'  labelName) (  ':'  labelName )* ;
 
-nodeLabel : ':' SP? labelName ;
-
-rangeLiteral : '*' SP? ( integerLiteral SP? )? ( '..' SP? ( integerLiteral SP? )? )? ;
+rangeLiteral : '*'  ( integerLiteral  )? ( '..'  ( integerLiteral  )? )? ;
 
 labelName : symbolicName ;
 
 relTypeName : symbolicName ;
 
-expression : expression10 ;
+expression : exp_not (  AND  exp_not )* ;
+
+
+//exp_not : ( NOT  )* exp_arithmatic ;
+exp_not : ( NOT  )? exp_arithmatic ;
+
 
-expression10 : exp_not ( SP AND SP exp_not )* ;
+//exp_arithmatic : exp_binary (  partialComparisonExpression )* ;
+exp_arithmatic : exp_binary (  partialComparisonExpression )? ;
 
-exp_not : ( NOT SP? )* exp_arithmatic ;
+exp_binary : exp_muldiv ( (  '+'  exp_muldiv ) | (  '-'  exp_muldiv ) )* ;
 
-exp_arithmatic : exp_binary ( SP? partialComparisonExpression )* ;
+exp_muldiv : exp_xor ( (  '*'  exp_xor ) | (  '/'  exp_xor ) | (  '%'  exp_xor ) )* ;
 
-exp_binary : exp_addsub ( ( SP? '+' SP? exp_addsub ) | ( SP? '-' SP? exp_addsub ) )* ;
+exp_xor : exp_unary (  '^'  exp_unary )* ;
 
-exp_addsub : exp_muldivmod ( ( SP? '*' SP? exp_muldivmod ) | ( SP? '/' SP? exp_muldivmod ) | ( SP? '%' SP? exp_muldivmod ) )* ;
+exp_unary : ( ( '+' | '-' )  )* exp_basic ;
 
-exp_muldivmod : exp_xor ( SP? '^' SP? exp_xor )* ;
 
-exp_xor : ( ( '+' | '-' ) SP? )* exp_unary ;
+// Remove nested array visit. Only support list visiting for constants.
+//exp_basic : expression2 ( (  '[' expression ']' ) | (  '[' expression? '..' expression? ']' ) )*;
+exp_basic : expression2 ( (  '[' expression ']' ) | (  '[' expression? '..' expression? ']' ) )?;
 
-exp_unary : expression2 ( ( SP? '[' expression ']' ) | ( SP? '[' expression? '..' expression? ']' ) );
 
-expression2 : atom ( SP? ( propertyLookup | nodeLabels ) )* ;
+expression2 : atom (  nodeLabels | propertyLookup )? ;
 
 atom : literal
-     | parameter
-     | ( COUNT SP? '(' SP? '*' SP? ')' )
+     | ( COUNT  '('  '*'  ')' )
      | relationshipsPattern
      | parenthesizedExpression
      | variable
@@ -112,26 +99,24 @@ booleanLiteral : TRUE
                | FALSE
                ;
 
-listLiteral : '[' SP? ( expression SP? ( ',' SP? expression SP? )* )? ']' ;
+listLiteral : '['  ( expression  ( ','  expression  )* )? ']' ;
 
-mapLiteral : '{' SP? ( propertyKeyName SP? ':' SP? expression SP? ( ',' SP? propertyKeyName SP? ':' SP? expression SP? )* )? '}' ;
+mapLiteral : '{'  ( propertyKeyName  ':'  expression  ( ','  propertyKeyName  ':'  expression  )* )? '}' ;
 
-partialComparisonExpression : ( '=' SP? exp_binary )
-                            | ( '<>' SP? exp_binary )
-                            | ( '!=' SP? exp_binary )
-                            | ( '<' SP? exp_binary )
-                            | ( '>' SP? exp_binary )
-                            | ( '<=' SP? exp_binary )
-                            | ( '>=' SP? exp_binary )
+partialComparisonExpression : ( '='  exp_binary )
+                            | ( '<>'  exp_binary )
+                            | ( '!='  exp_binary )
+                            | ( '<'  exp_binary )
+                            | ( '>'  exp_binary )
+                            | ( '<='  exp_binary )
+                            | ( '>='  exp_binary )
                             ;
 
-parenthesizedExpression : '(' SP? expression SP? ')' ;
+parenthesizedExpression : '('  expression  ')' ;
 
-parameter : '$' ( symbolicName | DecimalInteger ) ;
+relationshipsPattern : nodePattern (  patternElementChain )+ ;
 
-relationshipsPattern : nodePattern ( SP? patternElementChain )+ ;
-
-propertyLookup : '.' SP? ( propertyKeyName ) ;
+propertyLookup : '.'  ( propertyKeyName ) ;
 
 propertyKeyName : symbolicName ;
 
@@ -178,7 +163,6 @@ symbolicName : UnescapedSymbolicName
              | MATCH
              | RETURN
              | WHERE
-             | OR
              | AND
              | NOT
              | TRUE
@@ -188,8 +172,6 @@ COUNT : ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'N' | 'n' ) ( 'T' | 't' )  ;
 
 NULL : ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' )  ;
 
-OR : ( 'O' | 'o' ) ( 'R' | 'r' )  ;
-
 MATCH : ( 'M' | 'm' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'C' | 'c' ) ( 'H' | 'h' )  ;
 
 RETURN : ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'T' | 't' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'N' | 'n' )  ;
@@ -235,7 +217,7 @@ IdentifierPart : ID_Continue
 /**
  * Any character except "`", enclosed within `backticks`. Backticks are escaped with double backticks. */
 
-SP : ( WHITESPACE )+ ;
+SP : ( WHITESPACE )+ -> skip;
 
 WHITESPACE : SPACE
            | TAB
@@ -273,6 +255,8 @@ Comment : ( '/*' ( Comment_1 | ( '*' Comment_2 ) )* '*/' )
         | ( '//' ( Comment_3 )* CR? ( LF | EOF ) )
         ;
 
+
+
 leftArrowHead : '<'
           ;
 

Cypher.tokens

@@ -23,31 +23,29 @@ T__21=22
 T__22=23
 T__23=24
 T__24=25
-T__25=26
-StringLiteral=27
-DecimalInteger=28
-Digit=29
-NonZeroDigit=30
-NonZeroOctDigit=31
-OctDigit=32
-ZeroDigit=33
-RegularDecimalReal=34
-COUNT=35
-NULL=36
-OR=37
-MATCH=38
-RETURN=39
-WHERE=40
-AND=41
-NOT=42
-TRUE=43
-FALSE=44
-UnescapedSymbolicName=45
-IdentifierStart=46
-IdentifierPart=47
-SP=48
-WHITESPACE=49
-Comment=50
+StringLiteral=26
+DecimalInteger=27
+Digit=28
+NonZeroDigit=29
+NonZeroOctDigit=30
+OctDigit=31
+ZeroDigit=32
+RegularDecimalReal=33
+COUNT=34
+NULL=35
+MATCH=36
+RETURN=37
+WHERE=38
+AND=39
+NOT=40
+TRUE=41
+FALSE=42
+UnescapedSymbolicName=43
+IdentifierStart=44
+IdentifierPart=45
+SP=46
+WHITESPACE=47
+Comment=48
 ';'=1
 ','=2
 '='=3
@@ -72,6 +70,5 @@ Comment=50
 '>'=22
 '<='=23
 '>='=24
-'$'=25
-'.'=26
-'0'=33
+'.'=25
+'0'=32