From 74d5bc675d38e63f77b683d00dfabcd903036bec Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 6 Feb 2008 23:55:01 +0000 Subject: [PATCH] Shorted the definition of generateMapping in ArrayUsageCheckTest --- checks/ArrayUsageCheckTest.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/checks/ArrayUsageCheckTest.hs b/checks/ArrayUsageCheckTest.hs index d755628..869de41 100644 --- a/checks/ArrayUsageCheckTest.hs +++ b/checks/ArrayUsageCheckTest.hs @@ -564,11 +564,7 @@ testIndexes = TestList -- from one to the indexes of the next. If any of the keys in the map don't match -- (i.e. if (keys m0 /= keys m1)) Nothing will be returned generateMapping :: VarMap -> VarMap -> Maybe [(CoeffIndex,CoeffIndex)] -generateMapping m0 m1 = if Map.keys m0 /= Map.keys m1 then Nothing else Just (Map.elems $ zipMap f m0 m1) - where - f (Just x) (Just y) = Just (x,y) - f _ _ = Nothing - -- More readable than liftM (,) ! +generateMapping m0 m1 = if Map.keys m0 /= Map.keys m1 then Nothing else Just (Map.elems $ zipMap mergeMaybe m0 m1) -- | Given a forward mapping list, translates equations across translateEquations :: [(CoeffIndex,CoeffIndex)] -> (EqualityProblem, InequalityProblem) -> IO (Maybe (EqualityProblem, InequalityProblem))