Version 1.2.3: Minor grammar changes.

walter-weinmann · Dec 15, 2016 · 92b02bb · 92b02bb
1 parent ffcac04
commit 92b02bb
Show file tree

Hide file tree

Showing 18 changed files with 7,283 additions and 7,172 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 *.dot
-erl_crash.dump
 /_build
 /erl_crash.dump
 /rebar.lock

diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ notifications:
   email:
     - [email protected]
 otp_release:
+  - 19.2
   - 19.1
   - 19.0
   - 18.3
@@ -16,4 +17,4 @@ otp_release:
   - 17.1
   - 17.0
 after_success:
-  rebar ct
+  "./rebar3 ct"
diff --git a/README.md b/README.md
@@ -284,6 +284,54 @@ This project was inspired by the [sqlparse](https://github.com/K2InformaticsGmbH
 
 ## 6. Release Notes
 
+### Version 1.2.3
+
+Release Date: 15.12.2016 - Grammar as of 14.12.2016
+
+#### Grammar changes
+
+- **Expression9**
+
+```
+New: Expression9 = { (N,O,T), [SP] }, Expression8 ;
+
+Old: Expression9 = { SP, (N,O,T), SP }, Expression8 ;
+```
+
+- **LiteralIds** (Legacy)
+
+```
+New: LiteralIds = IntegerLiteral, { [SP], ',', [SP], IntegerLiteral } ;
+
+Old: LiteralIds = { [SP], ',', [SP] } ;
+```
+
+- **NodeLookup** (Legacy)
+
+```
+New: NodeLookup = (N,O,D,E), [SP], (IdentifiedIndexLookup | IndexQuery | IdLookup) ;
+
+Old: NodeLookup = (N,O,D,E), (IdentifiedIndexLookup | IndexQuery | IdLookup) ;
+```
+
+- **PeriodicCommitHint** (Legacy)
+
+```
+New: PeriodicCommitHint = (U,S,I,N,G), SP, (P,E,R,I,O,D,I,C), SP, (C,O,M,M,I,T), [SP, IntegerLiteral] ;
+
+Old: PeriodicCommitHint = (U,S,I,N,G), SP, (P,E,R,I,O,D,I,C), SP, (C,O,M,M,I,T), [SP] ;
+```
+
+- **SortItem**
+
+```
+New: SortItem = Expression, [[SP], ((A,S,C,E,N,D,I,N,G) | (A,S,C) | (D,E,S,C,E,N,D,I,N,G) | (D,E,S,C))] ;
+
+Old: SortItem = (Expression, ((D,E,S,C,E,N,D,I,N,G) | (D,E,S,C)))
+              | (Expression, [(A,S,C,E,N,D,I,N,G) | (A,S,C)])
+              ;
+```
+
 ### Version 1.2.2
 
 Release Date: 11.11.2016 - Grammar as of 10.11.2016
@@ -296,7 +344,6 @@ There are no relevant grammar changes available.
 
 - Support of rebar3.
 
-----------
 
 ### Version 1.2.1
 

diff --git a/priv/openCypher/cypher_2016_10_02.ebnf → priv/openCypher/cypher_2016_12_14.ebnf b/priv/openCypher/cypher_2016_10_02.ebnf → priv/openCypher/cypher_2016_12_14.ebnf
@@ -93,9 +93,7 @@ Skip = (S,K,I,P), SP, Expression ;
 
 Limit = (L,I,M,I,T), SP, Expression ;
 
-SortItem = (Expression, ((D,E,S,C,E,N,D,I,N,G) | (D,E,S,C)))
-         | (Expression, [(A,S,C,E,N,D,I,N,G) | (A,S,C)])
-         ;
+SortItem = Expression, [[SP], ((A,S,C,E,N,D,I,N,G) | (A,S,C) | (D,E,S,C,E,N,D,I,N,G) | (D,E,S,C))] ;
 
 Where = (W,H,E,R,E), SP, Expression ;
 
@@ -147,7 +145,7 @@ Expression11 = Expression10, { SP, (X,O,R), SP, Expression10 } ;
 
 Expression10 = Expression9, { SP, (A,N,D), SP, Expression9 } ;
 
-Expression9 = { SP, (N,O,T), SP }, Expression8 ;
+Expression9 = { (N,O,T), [SP] }, Expression8 ;
 
 Expression8 = Expression7, { [SP], PartialComparisonExpression } ;
 
@@ -308,15 +306,15 @@ UnescapedSymbolicName = IdentifierStart, { IdentifierPart } ;
  * And extended with a few characters.
  *)IdentifierStart = ID_Start
                 | '_'
-                | 'â€¿'
-                | 'â€'
-                | 'â”'
-                | 'ï¸³'
-                | 'ï¸´'
-                | 'ï¹'
-                | 'ï¹Ž'
-                | 'ï¹'
-                | 'ï¼¿'
+                | '‿'
+                | '⁀'
+                | '⁔'
+                | '︳'
+                | '︴'
+                | '﹍'
+                | '﹎'
+                | '﹏'
+                | '＿'
                 ;
 
 (* Based on the unicode identifier and pattern syntax
@@ -340,25 +338,25 @@ whitespace = SPACE
            | GS
            | RS
            | US
-           | 'áš€'
-           | 'á Ž'
-           | 'â€€'
-           | 'â€'
-           | 'â€‚'
-           | 'â€ƒ'
-           | 'â€„'
-           | 'â€…'
-           | 'â€†'
-           | 'â€ˆ'
-           | 'â€‰'
-           | 'â€Š'
-           | 'â€¨'
-           | 'â€©'
-           | 'âŸ'
-           | 'ã€€'
-           | 'Â '
-           | 'â€‡'
-           | 'â€¯'
+           | ' '
+           | '᠎'
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | '　'
+           | ' '
+           | ' '
+           | ' '
            | Comment
            ;
 
@@ -367,31 +365,31 @@ Comment = ('/*', { ANY - ('*') | ('*', ANY - ('/')) }, '*/')
         ;
 
 LeftArrowHead = '<'
-              | 'âŸ¨'
-              | 'ã€ˆ'
-              | 'ï¹¤'
-              | 'ï¼œ'
+              | '⟨'
+              | '〈'
+              | '﹤'
+              | '＜'
               ;
 
 RightArrowHead = '>'
-               | 'âŸ©'
-               | 'ã€‰'
-               | 'ï¹¥'
-               | 'ï¼ž'
+               | '⟩'
+               | '〉'
+               | '﹥'
+               | '＞'
                ;
 
 Dash = '-'
-     | 'Â'
-     | 'â€'
-     | 'â€‘'
-     | 'â€’'
-     | 'â€“'
-     | 'â€”'
-     | 'â€•'
-     | 'âˆ’'
-     | 'ï¹˜'
-     | 'ï¹£'
-     | 'ï¼'
+     | ''
+     | '‐'
+     | '‑'
+     | '‒'
+     | '–'
+     | '—'
+     | '―'
+     | '−'
+     | '﹘'
+     | '﹣'
+     | '－'
      ;
 
 A = 'A' | 'a' ;

diff --git a/.../openCypher/cypher_2016_10_02_legacy.ebnf → .../openCypher/cypher_2016_12_14_legacy.ebnf b/.../openCypher/cypher_2016_10_02_legacy.ebnf → .../openCypher/cypher_2016_12_14_legacy.ebnf
@@ -47,7 +47,7 @@ BulkImportQuery = PeriodicCommitHint, [SP], LoadCSVQuery ;
 
 SingleQuery = Clause, { [SP], Clause } ;
 
-PeriodicCommitHint = (U,S,I,N,G), SP, (P,E,R,I,O,D,I,C), SP, (C,O,M,M,I,T), [SP] ;
+PeriodicCommitHint = (U,S,I,N,G), SP, (P,E,R,I,O,D,I,C), SP, (C,O,M,M,I,T), [SP, IntegerLiteral] ;
 
 LoadCSVQuery = LoadCSV, { [SP], Clause } ;
 
@@ -169,9 +169,7 @@ Skip = (S,K,I,P), SP, Expression ;
 
 Limit = (L,I,M,I,T), SP, Expression ;
 
-SortItem = (Expression, ((D,E,S,C,E,N,D,I,N,G) | (D,E,S,C)))
-         | (Expression, [(A,S,C,E,N,D,I,N,G) | (A,S,C)])
-         ;
+SortItem = Expression, [[SP], ((A,S,C,E,N,D,I,N,G) | (A,S,C) | (D,E,S,C,E,N,D,I,N,G) | (D,E,S,C))] ;
 
 Hint = [SP], (((U,S,I,N,G), SP, (I,N,D,E,X), SP, Variable, NodeLabel, '(', PropertyKeyName, ')') | ((U,S,I,N,G), SP, (J,O,I,N), SP, (O,N), SP, Variable, { [SP], ',', [SP], Variable }) | ((U,S,I,N,G), SP, (S,C,A,N), SP, Variable, NodeLabel)) ;
 
@@ -183,7 +181,7 @@ Lookup = NodeLookup
        | RelationshipLookup
        ;
 
-NodeLookup = (N,O,D,E), (IdentifiedIndexLookup | IndexQuery | IdLookup) ;
+NodeLookup = (N,O,D,E), [SP], (IdentifiedIndexLookup | IndexQuery | IdLookup) ;
 
 RelationshipLookup = ((R,E,L,A,T,I,O,N,S,H,I,P) | (R,E,L)), (IdentifiedIndexLookup | IndexQuery | IdLookup) ;
 
@@ -193,7 +191,7 @@ IndexQuery = ':', SymbolicName, '(', (StringLiteral | LegacyParameter), ')' ;
 
 IdLookup = '(', (LiteralIds | LegacyParameter | '*'), ')' ;
 
-LiteralIds = { [SP], ',', [SP] } ;
+LiteralIds = IntegerLiteral, { [SP], ',', [SP], IntegerLiteral } ;
 
 Where = (W,H,E,R,E), SP, Expression ;
 
@@ -254,7 +252,7 @@ Expression11 = Expression10, { SP, (X,O,R), SP, Expression10 } ;
 
 Expression10 = Expression9, { SP, (A,N,D), SP, Expression9 } ;
 
-Expression9 = { SP, (N,O,T), SP }, Expression8 ;
+Expression9 = { (N,O,T), [SP] }, Expression8 ;
 
 Expression8 = Expression7, { [SP], PartialComparisonExpression } ;
 
@@ -427,15 +425,15 @@ UnescapedSymbolicName = IdentifierStart, { IdentifierPart } ;
  * And extended with a few characters.
  *)IdentifierStart = ID_Start
                 | '_'
-                | 'â€¿'
-                | 'â€'
-                | 'â”'
-                | 'ï¸³'
-                | 'ï¸´'
-                | 'ï¹'
-                | 'ï¹Ž'
-                | 'ï¹'
-                | 'ï¼¿'
+                | '‿'
+                | '⁀'
+                | '⁔'
+                | '︳'
+                | '︴'
+                | '﹍'
+                | '﹎'
+                | '﹏'
+                | '＿'
                 ;
 
 (* Based on the unicode identifier and pattern syntax
@@ -459,25 +457,25 @@ whitespace = SPACE
            | GS
            | RS
            | US
-           | 'áš€'
-           | 'á Ž'
-           | 'â€€'
-           | 'â€'
-           | 'â€‚'
-           | 'â€ƒ'
-           | 'â€„'
-           | 'â€…'
-           | 'â€†'
-           | 'â€ˆ'
-           | 'â€‰'
-           | 'â€Š'
-           | 'â€¨'
-           | 'â€©'
-           | 'âŸ'
-           | 'ã€€'
-           | 'Â '
-           | 'â€‡'
-           | 'â€¯'
+           | ' '
+           | '᠎'
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | ' '
+           | '　'
+           | ' '
+           | ' '
+           | ' '
            | Comment
            ;
 
@@ -486,31 +484,31 @@ Comment = ('/*', { ANY - ('*') | ('*', ANY - ('/')) }, '*/')
         ;
 
 LeftArrowHead = '<'
-              | 'âŸ¨'
-              | 'ã€ˆ'
-              | 'ï¹¤'
-              | 'ï¼œ'
+              | '⟨'
+              | '〈'
+              | '﹤'
+              | '＜'
               ;
 
 RightArrowHead = '>'
-               | 'âŸ©'
-               | 'ã€‰'
-               | 'ï¹¥'
-               | 'ï¼ž'
+               | '⟩'
+               | '〉'
+               | '﹥'
+               | '＞'
                ;
 
 Dash = '-'
-     | 'Â'
-     | 'â€'
-     | 'â€‘'
-     | 'â€’'
-     | 'â€“'
-     | 'â€”'
-     | 'â€•'
-     | 'âˆ’'
-     | 'ï¹˜'
-     | 'ï¹£'
-     | 'ï¼'
+     | ''
+     | '‐'
+     | '‑'
+     | '‒'
+     | '–'
+     | '—'
+     | '―'
+     | '−'
+     | '﹘'
+     | '﹣'
+     | '－'
      ;
 
 A = 'A' | 'a' ;