status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use current_group() helper

This commit is contained in:
Ari Lazier 2015-11-25 18:34:36 -08:00
parent be2a3fab47
commit 6ac6f39894
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
parser/parser.cpp
View File

@ -154,20 +154,20 @@ struct ParserState
void apply_or()
{
Predicate &group = *group_stack.back();
if (group.type == Predicate::Type::Or) {
Predicate *group = current_group();
if (group->type == Predicate::Type::Or) {
return;
}
// convert to OR
group.type = Predicate::Type::Or;
if (group.cpnd.sub_predicates.size() > 2) {
group->type = Predicate::Type::Or;
if (group->cpnd.sub_predicates.size() > 2) {
// split the current group into an AND group ORed with the last subpredicate
Predicate new_sub(Predicate::Type::And);
new_sub.cpnd.sub_predicates = std::move(group.cpnd.sub_predicates);
new_sub.cpnd.sub_predicates = std::move(group->cpnd.sub_predicates);
group.cpnd.sub_predicates = { new_sub, std::move(new_sub.cpnd.sub_predicates.back()) };
group.cpnd.sub_predicates[0].cpnd.sub_predicates.pop_back();
group->cpnd.sub_predicates = { new_sub, std::move(new_sub.cpnd.sub_predicates.back()) };
group->cpnd.sub_predicates[0].cpnd.sub_predicates.pop_back();
}
}