tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expression can be eather pattern expression or value expression

Browse Source
This commit is contained in:
Marko Budiselic 2016-06-26 12:27:26 +01:00
parent b5536d70fa
commit 04319c09e3
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -141,6 +141,7 @@ EXECUTE_PROCESS(
# add main executable # add main executable
add_executable(memgraph src/memgraph.cpp) add_executable(memgraph src/memgraph.cpp)
add_dependencies(memgraph cypher_lib)
# link libraries # link libraries
target_link_libraries(memgraph Threads::Threads) target_link_libraries(memgraph Threads::Threads)

16
src/cypher/cypher.y
View File

@ -390,11 +390,11 @@ value_expr(E) ::= BOOL(V). {
E = ast->create<ast::Boolean>(value); E = ast->create<ast::Boolean>(value);
} }
// %type pattern_expr {ast::Expr*} %type pattern_expr {ast::Expr*}
//
// patter_expr(E) ::= pattern(P). { pattern_expr(E) ::= pattern(P). {
// E = ast->create<ast::PatternExpr>(P); E = ast->create<ast::PatternExpr>(P);
// } }
%type expr {ast::Expr*} %type expr {ast::Expr*}
@ -402,9 +402,9 @@ expr(E) ::= value_expr(V). {
E = V; E = V;
} }
// expr(E) ::= patter_expr(P). { expr(E) ::= pattern_expr(P). {
// E = P; E = P;
// } }
//%type alias {ast::Alias*} //%type alias {ast::Alias*}
// //

6
src/cypher/debug/tree_print.hpp
View File

@ -106,6 +106,12 @@ public:
Traverser::visit(pattern); Traverser::visit(pattern);
} }
void visit(ast::PatternExpr& pattern_expr) override
{
auto entry = printer.advance("Pattern Expression");
Traverser::visit(pattern_expr);
}
void visit(ast::Node& node) override void visit(ast::Node& node) override
{ {
auto entry = printer.advance("Node"); auto entry = printer.advance("Node");

5
src/cypher/visitor/traverser.hpp
View File

@ -39,6 +39,11 @@ public:
accept(pattern.next); accept(pattern.next);
} }
void visit(ast::PatternExpr& pattern_expr) override
{
accept(pattern_expr.pattern);
}
void visit(ast::Node& node) override void visit(ast::Node& node) override
{ {
accept(node.idn); accept(node.idn);

2
tests/data/cypher_queries/complex/powerlinx_opportunities.cypher
View File

@ -1 +1 @@
# MATCH (p:Personnel)-[:CREATED]->(o:Opportunity)-[:HAS_MATCH]->(c:Company {id: "321"}) RETURN (a:Account {id: "123"})-[:IS]->(p) MATCH (p:Personnel)-[:CREATED]->(o:Opportunity)-[:HAS_MATCH]->(c:Company {id: "321"}) RETURN (a:Account {id: "123"})-[:IS]->(p)