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

avoid unnecessary building of a one-off Map

Browse source 
A case lookup should be more efficient.
This commit is contained in:
Joey Hess 2016-02-03 12:59:28 -04:00
parent 199c4f9508
commit aded00c5f0
Failed to extract signature
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Annex/FileMatcher.hs
View file

@ -74,26 +74,26 @@ exprParser matchstandard matchgroupwanted getgroupmap configmap mu expr =
parseToken :: FileMatcher Annex -> FileMatcher Annex -> MkLimit Annex -> MkLimit Annex -> Annex GroupMap -> String -> Either String (Token (MatchFiles Annex))
parseToken matchstandard matchgroupwanted checkpresent checkpreferreddir getgroupmap t
| t `elem` tokens = Right $ token t
| t == "standard" = call matchstandard
| t == "groupwanted" = call matchgroupwanted
| t == "present" = use checkpresent
| t == "inpreferreddir" = use checkpreferreddir
| t == "unused" = Right $ Operation limitUnused
| t == "anything" = Right $ Operation limitAnything
| t == "nothing" = Right $ Operation limitNothing
| otherwise = maybe (Left $ "near " ++ show t) use $ M.lookup k $
M.fromList
[ ("include", limitInclude)
, ("exclude", limitExclude)
, ("copies", limitCopies)
, ("lackingcopies", limitLackingCopies False)
, ("approxlackingcopies", limitLackingCopies True)
, ("inbackend", limitInBackend)
, ("largerthan", limitSize (>))
, ("smallerthan", limitSize (<))
, ("metadata", limitMetaData)
, ("inallgroup", limitInAllGroup getgroupmap)
]
| otherwise = case t of
"standard" -> call matchstandard
"groupwanted" -> call matchgroupwanted
"present" -> use checkpresent
"inpreferreddir" -> use checkpreferreddir
"unused" -> Right $ Operation limitUnused
"anything" -> Right $ Operation limitAnything
"nothing" -> Right $ Operation limitNothing
_ -> case k of
"include" -> use limitInclude
"exclude" -> use limitExclude
"copies" -> use limitCopies
"lackingcopies" -> use $ limitLackingCopies False
"approxlackingcopies" -> use $ limitLackingCopies True
"inbackend" -> use limitInBackend
"largerthan" -> use $ limitSize (>)
"smallerthan" -> use $ limitSize (<)
"metadata" -> use limitMetaData
"inallgroup" -> use $ limitInAllGroup getgroupmap
_ -> Left $ "near " ++ show t
where
(k, v) = separate (== '=') t
use a = Operation <$> a v