Merge pull request #85 from walter-weinmann/wwe

Version 1.4.2.
walter-weinmann · Nov 18, 2017 · 8f745b8 · 8f745b8
2 parents 5c57059 + 656d943
commit 8f745b8
Show file tree

Hide file tree

Showing 9 changed files with 5,253 additions and 10,501 deletions.
diff --git a/README.md b/README.md
@@ -232,10 +232,6 @@ The documentation for **ocparse** is available here: [Wiki](https://github.com/w
 
 The number of block comments (`/* ... */`) is limted to one per line.
 
-### ParenthesizedExpression
-
-`ParenthesizedExpression` is not supported due to a conflict with `NodePattern`.
-
 ### Properties / Literal
 
 The rule `Properties` has a higher precedence than the rule `Literal`.
@@ -285,12 +281,6 @@ it is only used
 MultiPartQuery = (ReadPart | (UpdatingStartClause, [SP], UpdatingPart)), With, [SP], { ReadPart,               With, [SP] }, SinglePartQuery ;
 `
 
-### ParenthesizedExpression
-
-`
-ParenthesizedExpression = '(', [SP], Expression, [SP], ')' ;
-`
-
 ### SchemaName
 
 `

diff --git a/include/ocparse_generator.hrl b/include/ocparse_generator.hrl
@@ -198,9 +198,9 @@
 -define(SP_OPT, []).
 
 -define(TESTS_FROM_NEO4J_V3_3, [
-%% wwe
-%%  {"chapter name", "subchapter name", "page", "code"}
-    % --------------------------------------------------------------------------
+    % ==========================================================================
+    % Tuple structure: {chapter, section, subsection, completion, code}
+    % ==========================================================================
     % Chapter 4. Get started with Cypher
     % --------------------------------------------------------------------------
     {"Chapter 4. Get started with Cypher", "4.1. Patterns", "",
@@ -648,7 +648,7 @@
         "
         CALL db.resampleIndex($indexname)
     "},
-%% wwe
+%% wwe legacy
 %%    % --------------------------------------------------------------------------
 %%    {"Chapter 6. Syntax", "6.4. Parameters", "6.4.12. Index value (explicit indexes)", cypher,
 %%        "

diff --git a/priv/BNF_Converter/ocparse.cf b/priv/BNF_Converter/ocparse.cf
@@ -894,8 +894,7 @@ Atom11.                                          Atom ::= "ANY"     "(" FilterEx
 Atom12.                                          Atom ::= "NONE"    "(" FilterExpression                ")" ;
 Atom13.                                          Atom ::= "SINGLE"  "(" FilterExpression                ")" ;
 Atom14.                                          Atom ::= RelationshipsPattern                              ;
--- wwe
--- Atom15.                                          Atom ::= ParenthesizedExpression                           ;
+Atom15.                                          Atom ::= ParenthesizedExpression                           ;
 Atom16.                                          Atom ::= FunctionInvocation                                ;
 Atom17.                                          Atom ::= Variable                                          ;
 
@@ -941,8 +940,7 @@ PartialComparisonExpression06.                   PartialComparisonExpression ::=
 
 -- parenthesized_expression -> '(' expression ')'                                                  : {parenthesizedExpression, '$2'}.
 
--- wwe
--- ParenthesizedExpression01.                       ParenthesizedExpression ::= "(" Expression ")" ;
+ParenthesizedExpression01.                       ParenthesizedExpression ::= "(" Expression ")" ;
 
 -- relationships_pattern -> node_pattern pattern_element_chain_list                                : {relationshipsPattern, '$1', '$2'}.
 

diff --git a/priv/Railroad_Diagram_Generator/ocparse.ebnf b/priv/Railroad_Diagram_Generator/ocparse.ebnf
@@ -522,9 +522,7 @@ atom ::= literal
        | ( ( 'FILTER' | 'ALL' | 'ANY' | 'NONE' | 'SINGLE' ) '(' filterExpression ')' )
        | ( 'EXTRACT' '(' filterExpression ( '|' expression )? ')' )
        | relationshipsPattern
-/* wwe
        | parenthesizedExpression
-*/
        | functionInvocation
        | variable
 
@@ -542,9 +540,7 @@ listLiteral ::= '[' ( expression ( ',' expression )* )? ']'
 
 partialComparisonExpression ::= ( '=' | '<>' | '<' | '>' | '<=' | '>=' ) addOrSubtractExpression
 
-/* wwe
 parenthesizedExpression ::= '(' expression ')'
-*/
 
 relationshipsPattern ::= nodePattern patternElementChain+