aboutsummaryrefslogtreecommitdiff
path: root/Utility/Matcher.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-04 15:48:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-04 16:00:19 -0400
commit9214a810faa300862d3d847c9ee425e5605bccef (patch)
tree4c69e8fa7bb7bc0bc107b328b817b6e7c6c9c4e3 /Utility/Matcher.hs
parenta0e16e34466008221ad2431ca001ddb536b88b84 (diff)
added preferred-content log, and allow editing it with vicfg
This includes a full parser for the boolean expressions in the log, that compiles them into Matchers. Those matchers are not used yet. A complication is that matching against an expression should never crash git-annex with an error. Instead, vicfg checks that the expressions parse. If a bad expression (or an expression understood by some future git-annex version) gets into the log, it'll be ignored. Most of the code in Limit couldn't fail anyway, but I did have to make limitCopies check its parameter first, and return an error if it's bad, rather than erroring at runtime.
Diffstat (limited to 'Utility/Matcher.hs')
-rw-r--r--Utility/Matcher.hs4
1 files changed, 4 insertions, 0 deletions
diff --git a/Utility/Matcher.hs b/Utility/Matcher.hs
index 9b6005767..83a2b1d61 100644
--- a/Utility/Matcher.hs
+++ b/Utility/Matcher.hs
@@ -19,6 +19,7 @@ module Utility.Matcher (
Token(..),
Matcher,
token,
+ tokens,
generate,
match,
matchM,
@@ -48,6 +49,9 @@ token "(" = Open
token ")" = Close
token t = error $ "unknown token " ++ t
+tokens :: [String]
+tokens = words "and or not ( )"
+
{- Converts a list of Tokens into a Matcher. -}
generate :: [Token op] -> Matcher op
generate = go MAny