Merge pull request #1572 from kuzudb/parser-error

Fix parser error
kuzudb · May 25, 2023 · dba7110 · dba7110
2 parents 58c92ee + 6b00141
commit dba7110
Show file tree

Hide file tree

Showing 4 changed files with 1,680 additions and 1,869 deletions.
diff --git a/src/antlr4/Cypher.g4 b/src/antlr4/Cypher.g4
@@ -283,9 +283,7 @@ oC_PatternElement
         ;
 
 oC_NodePattern
-    : '(' SP? ( oC_Variable SP? )? ( oC_NodeLabels SP? )? ( kU_Properties SP? )? ')'
-        | SP? ( oC_Variable SP? )? ( oC_NodeLabels SP? )? ( kU_Properties SP? )? { notifyNodePatternWithoutParentheses($oC_Variable.text, $oC_Variable.start); }
-        ;
+    : '(' SP? ( oC_Variable SP? )? ( oC_NodeLabels SP? )? ( kU_Properties SP? )? ')' ;
 
 oC_PatternElementChain
     : oC_RelationshipPattern SP? oC_NodePattern ;

diff --git a/test/parser/syntax_error_test.cpp b/test/parser/syntax_error_test.cpp
@@ -35,16 +35,6 @@ TEST_F(SyntaxErrorTest, QueryNotConcludeWithReturn2) {
     ASSERT_STREQ(expectedException.c_str(), getParsingError(input).c_str());
 }
 
-TEST_F(SyntaxErrorTest, QueryNodeWithOutParentheses) {
-    std::string expectedException =
-        "Parser exception: Parentheses are required to identify nodes in "
-        "patterns, i.e. (a) (line: 1, offset: 6)\n";
-    expectedException += "\"MATCH a RETURN *;\"\n";
-    expectedException += "       ^";
-    auto input = "MATCH a RETURN *;";
-    ASSERT_STREQ(expectedException.c_str(), getParsingError(input).c_str());
-}
-
 TEST_F(SyntaxErrorTest, InvalidNotEqualOperator) {
     std::string expectedException =
         "Parser exception: Unknown operation '!=' (you probably meant to use '<>', which is "