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

mini simplification

This commit is contained in:
Jan Steemann 2015-04-16 17:54:04 +02:00
parent 73899168be
commit 2e5fac692f
2 changed files with 310 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

619
arangod/Aql/grammar.cpp
View File

File diff suppressed because it is too large Load Diff

7
arangod/Aql/grammar.y
View File

@ -315,10 +315,6 @@ collect_variable_list:
collect_statement:
T_COLLECT count_into {
if ($2 == nullptr) {
parser->registerParseError(TRI_ERROR_QUERY_PARSE, "use of 'COUNT' without 'INTO'", yylloc.first_line, yylloc.first_column);
}
auto scopes = parser->ast()->scopes();
// check if we are in the main scope
@ -385,7 +381,8 @@ collect_statement:
}
}
if ($2 == nullptr && $3 != nullptr) {
if ($2 == nullptr &&
$3 != nullptr) {
parser->registerParseError(TRI_ERROR_QUERY_PARSE, "use of 'KEEP' without 'INTO'", yylloc.first_line, yylloc.first_column);
}