Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2014-11-28 16:15:47 +01:00
parent 7664fc643c acf070c6ac
commit 6a53d40c24
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arangod/Aql/grammar.y
View File

@ -169,7 +169,6 @@ void Aqlerror (YYLTYPE* locp,
%type <node> list_elements_list;
%type <node> array;
%type <node> query_options;
%type <node> optional_keep;
%type <node> optional_array_elements;
%type <node> array_elements_list;
%type <node> array_element;
@ -267,7 +266,7 @@ collect_statement:
T_COLLECT {
auto node = parser->ast()->createNodeList();
parser->pushStack(node);
} collect_list optional_into optional_keep {
} collect_list optional_into {
auto list = static_cast<AstNode const*>(parser->popStack());
if (list == nullptr) {
@ -325,31 +324,6 @@ optional_into:
}
;
variable_list:
variable_name {
auto name = parser->ast()->createNodeValueString($1);
parser->pushList(name);
}
| variable_list T_COMMA variable_name {
}
;
optional_keep:
/* empty */ {
$$ = nullptr;
}
| T_STRING {
if (! TRI_CaseEqualString($1, "KEEP")) {
parser->registerParseError(TRI_ERROR_QUERY_PARSE, "unexpected qualifier '%s', expecting 'KEEP'", $1, yylloc.first_line, yylloc.first_column);
}
auto node = parser->ast()->createNodeList();
parser->pushStack(node);
} variable_list {
auto list = static_cast<AstNode*>(parser->popStack());
$$ = list;
}
;
sort_statement:
T_SORT {
auto node = parser->ast()->createNodeList();