add minus/factorial order

kuzudb · Dec 20, 2022 · dcfe3e1 · dcfe3e1
1 parent ad02275
commit dcfe3e1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/src/antlr4/Cypher.g4 b/src/antlr4/Cypher.g4
@@ -343,7 +343,7 @@ oC_PowerOfExpression
     : oC_UnaryAddSubtractOrFactorialExpression ( SP? '^' SP? oC_UnaryAddSubtractOrFactorialExpression )* ;
 
 oC_UnaryAddSubtractOrFactorialExpression
-    : ( MINUS SP? )? oC_StringListNullOperatorExpression SP? FACTORIAL? ;
+    : ( MINUS SP? )? oC_StringListNullOperatorExpression (SP? FACTORIAL)? ;
 
 MINUS : '-' ;
 

diff --git a/src/parser/transformer.cpp b/src/parser/transformer.cpp
@@ -528,7 +528,13 @@ unique_ptr<ParsedExpression> Transformer::transformPowerOfExpression(
 
 unique_ptr<ParsedExpression> Transformer::transformUnaryAddSubtractOrFactorialExpression(
     CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContext& ctx) {
-    if (ctx.MINUS()) {
+    if (ctx.MINUS() && ctx.FACTORIAL()) {
+        auto exp1 = make_unique<ParsedFunctionExpression>(FACTORIAL_FUNC_NAME,
+            transformStringListNullOperatorExpression(*ctx.oC_StringListNullOperatorExpression()),
+            ctx.getText());
+        return make_unique<ParsedFunctionExpression>(
+            NEGATE_FUNC_NAME, std::move(exp1), ctx.getText());
+    } else if (ctx.MINUS()) {
         return make_unique<ParsedFunctionExpression>(NEGATE_FUNC_NAME,
             transformStringListNullOperatorExpression(*ctx.oC_StringListNullOperatorExpression()),
             ctx.getText());

diff --git a/third_party/antlr4_cypher/cypher_parser.cpp b/third_party/antlr4_cypher/cypher_parser.cpp
@@ -6887,6 +6887,10 @@ tree::TerminalNode* CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContex
   return getToken(CypherParser::MINUS, 0);
 }
 
+tree::TerminalNode* CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContext::FACTORIAL() {
+  return getToken(CypherParser::FACTORIAL, 0);
+}
+
 std::vector<tree::TerminalNode *> CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContext::SP() {
   return getTokens(CypherParser::SP);
 }
@@ -6895,10 +6899,6 @@ tree::TerminalNode* CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContex
   return getToken(CypherParser::SP, i);
 }
 
-tree::TerminalNode* CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContext::FACTORIAL() {
-  return getToken(CypherParser::FACTORIAL, 0);
-}
-
 
 size_t CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContext::getRuleIndex() const {
   return CypherParser::RuleOC_UnaryAddSubtractOrFactorialExpression;
@@ -6937,27 +6937,27 @@ CypherParser::OC_UnaryAddSubtractOrFactorialExpressionContext* CypherParser::oC_
     }
     setState(1235);
     oC_StringListNullOperatorExpression();
-    setState(1237);
+    setState(1240);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 214, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 215, _ctx)) {
     case 1: {
-      setState(1236);
-      match(CypherParser::SP);
+      setState(1237);
+      _errHandler->sync(this);
+
+      _la = _input->LA(1);
+      if (_la == CypherParser::SP) {
+        setState(1236);
+        match(CypherParser::SP);
+      }
+      setState(1239);
+      match(CypherParser::FACTORIAL);
       break;
     }
 
     default:
       break;
     }
-    setState(1240);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == CypherParser::FACTORIAL) {
-      setState(1239);
-      match(CypherParser::FACTORIAL);
-    }
 
   }
   catch (RecognitionException &e) {
@@ -10123,10 +10123,10 @@ CypherParser::Initializer::Initializer() {
     0x2, 0x2, 0x4d1, 0x4d0, 0x3, 0x2, 0x2, 0x2, 0x4d1, 0x4d2, 0x3, 0x2, 
     0x2, 0x2, 0x4d2, 0x4d4, 0x3, 0x2, 0x2, 0x2, 0x4d3, 0x4cf, 0x3, 0x2, 
     0x2, 0x2, 0x4d3, 0x4d4, 0x3, 0x2, 0x2, 0x2, 0x4d4, 0x4d5, 0x3, 0x2, 
-    0x2, 0x2, 0x4d5, 0x4d7, 0x5, 0x9e, 0x50, 0x2, 0x4d6, 0x4d8, 0x7, 0x6e, 
+    0x2, 0x2, 0x4d5, 0x4da, 0x5, 0x9e, 0x50, 0x2, 0x4d6, 0x4d8, 0x7, 0x6e, 
     0x2, 0x2, 0x4d7, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0x4d7, 0x4d8, 0x3, 0x2, 
-    0x2, 0x2, 0x4d8, 0x4da, 0x3, 0x2, 0x2, 0x2, 0x4d9, 0x4db, 0x7, 0x57, 
-    0x2, 0x2, 0x4da, 0x4d9, 0x3, 0x2, 0x2, 0x2, 0x4da, 0x4db, 0x3, 0x2, 
+    0x2, 0x2, 0x4d8, 0x4d9, 0x3, 0x2, 0x2, 0x2, 0x4d9, 0x4db, 0x7, 0x57, 
+    0x2, 0x2, 0x4da, 0x4d7, 0x3, 0x2, 0x2, 0x2, 0x4da, 0x4db, 0x3, 0x2, 
     0x2, 0x2, 0x4db, 0x9d, 0x3, 0x2, 0x2, 0x2, 0x4dc, 0x4e0, 0x5, 0xaa, 
     0x56, 0x2, 0x4dd, 0x4e1, 0x5, 0xa6, 0x54, 0x2, 0x4de, 0x4e1, 0x5, 0xa0, 
     0x51, 0x2, 0x4df, 0x4e1, 0x5, 0xa8, 0x55, 0x2, 0x4e0, 0x4dd, 0x3, 0x2, 

diff --git a/third_party/antlr4_cypher/include/cypher_parser.h b/third_party/antlr4_cypher/include/cypher_parser.h
@@ -1279,9 +1279,9 @@ class  CypherParser : public antlr4::Parser {
     virtual size_t getRuleIndex() const override;
     OC_StringListNullOperatorExpressionContext *oC_StringListNullOperatorExpression();
     antlr4::tree::TerminalNode *MINUS();
+    antlr4::tree::TerminalNode *FACTORIAL();
     std::vector<antlr4::tree::TerminalNode *> SP();
     antlr4::tree::TerminalNode* SP(size_t i);
-    antlr4::tree::TerminalNode *FACTORIAL();
 
 
   };