greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

WIP - add ability to have OR's in NOT's and NOT's in OR's

Browse source
This commit is contained in:
Emily Toop 2017-03-31 10:57:39 +01:00
parent 7c3f6f3698
commit 24a6cce418
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
query/src/lib.rs
View file

@ -533,8 +533,9 @@ pub struct NotJoin {
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Clone, Debug, Eq, PartialEq)] #[derive(Clone, Debug, Eq, PartialEq)]
pub enum WhereClause { pub enum WhereClause {
Not, Not(Box<WhereNotClause>),
NotJoin(NotJoin), NotJoin(NotJoin),
Or(Box<OrWhereClause>),
OrJoin(OrJoin), OrJoin(OrJoin),
Pred(Predicate), Pred(Predicate),
WhereFn, WhereFn,
@ -567,10 +568,11 @@ impl ContainsVariables for WhereClause {
fn accumulate_mentioned_variables(&self, acc: &mut BTreeSet<Variable>) { fn accumulate_mentioned_variables(&self, acc: &mut BTreeSet<Variable>) {
use WhereClause::*; use WhereClause::*;
match self { match self {
&Or(ref o) => o.accumulate_mentioned_variables(acc),
&OrJoin(ref o) => o.accumulate_mentioned_variables(acc), &OrJoin(ref o) => o.accumulate_mentioned_variables(acc),
&Pred(ref p) => p.accumulate_mentioned_variables(acc), &Pred(ref p) => p.accumulate_mentioned_variables(acc),
&Pattern(ref p) => p.accumulate_mentioned_variables(acc), &Pattern(ref p) => p.accumulate_mentioned_variables(acc),
&Not => (), &Not(ref n) => n.accumulate_mentioned_variables(acc),
&NotJoin(ref n) => n.accumulate_mentioned_variables(acc), &NotJoin(ref n) => n.accumulate_mentioned_variables(acc),
&WhereFn => (), &WhereFn => (),
&RuleExpr => (), &RuleExpr => (),
@ -584,7 +586,7 @@ impl ContainsVariables for OrWhereClause {
match self { match self {
&And(ref clauses) => for clause in clauses { clause.accumulate_mentioned_variables(acc) }, &And(ref clauses) => for clause in clauses { clause.accumulate_mentioned_variables(acc) },
&Clause(ref clause) => clause.accumulate_mentioned_variables(acc), &Clause(ref clause) => clause.accumulate_mentioned_variables(acc),
&Not(ref clause) => clause.accumulate_mentioned_variables(acc), &Not(ref clauses) => for clause in clauses { clause.accumulate_mentioned_variables(acc) },
} }
} }
} }
@ -604,7 +606,7 @@ impl ContainsVariables for WhereNotClause {
match self { match self {
&And(ref clauses) => for clause in clauses { clause.accumulate_mentioned_variables(acc) }, &And(ref clauses) => for clause in clauses { clause.accumulate_mentioned_variables(acc) },
&Clause(ref clause) => clause.accumulate_mentioned_variables(acc), &Clause(ref clause) => clause.accumulate_mentioned_variables(acc),
&Or(ref clause) => clause.accumulate_mentioned_variables(acc), &Or(ref clauses) => for clause in clauses { clause.accumulate_mentioned_variables(acc) },
} }
} }
} }