mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix handling of Not in the matcher

Browse source
This commit is contained in:
Joey Hess 2013-05-25 13:50:27 -04:00
parent b276857a7a
commit d4234b461b
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Utility/Matcher.hs
View file

@ -64,14 +64,18 @@ generate = simplify . process MAny . tokenGroups
process m [] = m process m [] = m
process m ts = uncurry process $ consume m ts process m ts = uncurry process $ consume m ts
consume m ((One And):y:rest) = (m `MAnd` process MAny [y], rest) consume m ((One And):rest) = term (m `MAnd`) rest
consume m ((One Or):y:rest) = (m `MOr` process MAny [y], rest) consume m ((One Or):rest) = term (m `MOr`) rest
consume m ((One Not):x:rest) = (m `MAnd` MNot (process MAny [x]), rest) consume m ((One Not):rest) = term (\p -> m `MAnd` (MNot p)) rest
consume m ((One (Operation o)):rest) = (m `MAnd` MOp o, rest) consume m ((One (Operation o)):rest) = (m `MAnd` MOp o, rest)
consume m (Group g:rest) = (process m g, rest) consume m (Group g:rest) = (process m g, rest)
consume m (_:rest) = consume m rest consume m (_:rest) = consume m rest
consume m [] = (m, []) consume m [] = (m, [])
term a l =
let (p, l') = consume MAny l
in (a p, l')
simplify (MAnd MAny x) = simplify x simplify (MAnd MAny x) = simplify x
simplify (MAnd x MAny) = simplify x simplify (MAnd x MAny) = simplify x
simplify (MAnd x y) = MAnd (simplify x) (simplify y) simplify (MAnd x y) = MAnd (simplify x) (simplify y)
@ -148,6 +152,18 @@ prop_matcher_sane = all (\m -> match dummy m ()) $ map generate
, [Not, Open, Operation True, And, Operation False, Close] , [Not, Open, Operation True, And, Operation False, Close]
, [Not, Open, Not, Open, Not, Operation False, Close, Close] , [Not, Open, Not, Open, Not, Operation False, Close, Close]
, [Not, Open, Not, Open, Not, Open, Not, Operation True, Close, Close] , [Not, Open, Not, Open, Not, Open, Not, Operation True, Close, Close]
, [Operation True, And, Not, Operation False]
, [Operation True, Not, Operation False]
, [Operation True, Not, Not, Not, Operation False]
, [Operation True, Not, Not, Not, Operation False, And, Operation True]
, [Operation True, Not, Not, Not, Operation False, Operation True]
, [Not, Open, Operation True, And, Operation False, Close,
And, Open,
Open, Operation True, And, Operation False, Close,
Or,
Open, Operation True, And, Open, Not, Operation False, Close, Close,
Close, And,
Open, Not, Operation False, Close]
] ]
where where
dummy b _ = b dummy b _ = b