From af197c7fc387794d3a558b4f8f23ebd9d5554aa0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 3 Feb 2016 13:01:44 -0400 Subject: refactor --- Annex/FileMatcher.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs index fba26a898..641fe49c9 100644 --- a/Annex/FileMatcher.hs +++ b/Annex/FileMatcher.hs @@ -79,9 +79,9 @@ parseToken matchstandard matchgroupwanted checkpresent checkpreferreddir getgrou "groupwanted" -> call matchgroupwanted "present" -> use checkpresent "inpreferreddir" -> use checkpreferreddir - "unused" -> Right $ Operation limitUnused - "anything" -> Right $ Operation limitAnything - "nothing" -> Right $ Operation limitNothing + "unused" -> simply limitUnused + "anything" -> simply limitAnything + "nothing" -> simply limitNothing _ -> case k of "include" -> use limitInclude "exclude" -> use limitExclude @@ -96,6 +96,7 @@ parseToken matchstandard matchgroupwanted checkpresent checkpreferreddir getgrou _ -> Left $ "near " ++ show t where (k, v) = separate (== '=') t + simply = Right . Operation use a = Operation <$> a v call sub = Right $ Operation $ \notpresent mi -> matchMrun sub $ \a -> a notpresent mi -- cgit v1.2.3