diff --git a/scripts/antlr4/Cypher.g4.copy b/scripts/antlr4/Cypher.g4.copy index 6da90f49724..7eb877a365b 100644 --- a/scripts/antlr4/Cypher.g4.copy +++ b/scripts/antlr4/Cypher.g4.copy @@ -144,7 +144,7 @@ kU_CreateRelTable : CREATE SP REL SP TABLE SP oC_SchemaName SP? '(' SP? kU_RelTableConnection SP? ( ',' SP? kU_PropertyDefinitionsDDL SP? )? ( ',' SP? oC_SymbolicName SP? )? ')' ; kU_CreateRelTableGroup - : CREATE SP REL SP TABLE SP GROUP SP oC_SchemaName SP? '(' SP? kU_RelTableConnection SP ? (',' SP? kU_RelTableConnection)+ SP? ( ',' SP? kU_PropertyDefinitionsDDL SP? )? ( ',' SP? oC_SymbolicName SP? )? ')' ; + : CREATE SP REL SP TABLE SP GROUP SP oC_SchemaName SP? '(' SP? kU_RelTableConnection ( SP? ',' SP? kU_RelTableConnection )+ SP? ( ',' SP? kU_PropertyDefinitionsDDL SP? )? ( ',' SP? oC_SymbolicName SP? )? ')' ; GROUP : ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'P' | 'p' ) ; diff --git a/src/antlr4/Cypher.g4 b/src/antlr4/Cypher.g4 index 6da90f49724..7eb877a365b 100644 --- a/src/antlr4/Cypher.g4 +++ b/src/antlr4/Cypher.g4 @@ -144,7 +144,7 @@ kU_CreateRelTable : CREATE SP REL SP TABLE SP oC_SchemaName SP? '(' SP? kU_RelTableConnection SP? ( ',' SP? kU_PropertyDefinitionsDDL SP? )? ( ',' SP? oC_SymbolicName SP? )? ')' ; kU_CreateRelTableGroup - : CREATE SP REL SP TABLE SP GROUP SP oC_SchemaName SP? '(' SP? kU_RelTableConnection SP ? (',' SP? kU_RelTableConnection)+ SP? ( ',' SP? kU_PropertyDefinitionsDDL SP? )? ( ',' SP? oC_SymbolicName SP? )? ')' ; + : CREATE SP REL SP TABLE SP GROUP SP oC_SchemaName SP? '(' SP? kU_RelTableConnection ( SP? ',' SP? kU_RelTableConnection )+ SP? ( ',' SP? kU_PropertyDefinitionsDDL SP? )? ( ',' SP? oC_SymbolicName SP? )? ')' ; GROUP : ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'P' | 'p' ) ; diff --git a/src/include/function/udf_function.h b/src/include/function/udf_function.h index 800720fe62a..fe67650edb9 100644 --- a/src/include/function/udf_function.h +++ b/src/include/function/udf_function.h @@ -116,7 +116,7 @@ struct UDF { } validateType(parameterTypes[0]); function::scalar_func_exec_t execFunc = - [=](const std::vector>& params, + [udfFunc](const std::vector>& params, common::ValueVector& result, void* /*dataPtr*/ = nullptr) -> void { KU_ASSERT(params.size() == 1); UnaryFunctionExecutor::executeUDF( @@ -143,7 +143,7 @@ struct UDF { validateType(parameterTypes[0]); validateType(parameterTypes[1]); function::scalar_func_exec_t execFunc = - [=](const std::vector>& params, + [udfFunc](const std::vector>& params, common::ValueVector& result, void* /*dataPtr*/ = nullptr) -> void { KU_ASSERT(params.size() == 2); BinaryFunctionExecutor::executeUDF(parameterTypes[1]); validateType(parameterTypes[2]); function::scalar_func_exec_t execFunc = - [=](const std::vector>& params, + [udfFunc](const std::vector>& params, common::ValueVector& result, void* /*dataPtr*/ = nullptr) -> void { KU_ASSERT(params.size() == 3); TernaryFunctionExecutor::executeUDFsync(this); - - _la = _input->LA(1); - if (_la == CypherParser::SP) { - setState(792); - match(CypherParser::SP); - } setState(800); _errHandler->sync(this); alt = 1; do { switch (alt) { case 1: { + setState(793); + _errHandler->sync(this); + + _la = _input->LA(1); + if (_la == CypherParser::SP) { + setState(792); + match(CypherParser::SP); + } setState(795); match(CypherParser::T__2); setState(797);