suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reindented some code in ArrayUsageCheck (just tidying up)

Browse Source
This commit is contained in:
Neil Brown 2008-06-06 10:44:05 +00:00
parent b603b43b57
commit 7538fcc225
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
checks/ArrayUsageCheck.hs
View File

@ -453,16 +453,16 @@ makeEquations accesses bound
flatten :: A.Expression -> Either String [FlattenedExp] flatten :: A.Expression -> Either String [FlattenedExp]
flatten (A.Literal _ _ (A.IntLiteral _ n)) = return [Const (read n)] flatten (A.Literal _ _ (A.IntLiteral _ n)) = return [Const (read n)]
flatten e@(A.Dyadic m op lhs rhs) flatten e@(A.Dyadic m op lhs rhs)
| op == A.Add = combine' (flatten lhs) (flatten rhs) | op == A.Add = combine' (flatten lhs) (flatten rhs)
| op == A.Subtr = combine' (flatten lhs) (mapM (scale (-1)) =<< flatten rhs) | op == A.Subtr = combine' (flatten lhs) (mapM (scale (-1)) =<< flatten rhs)
| op == A.Mul = multiplyOut' (flatten lhs) (flatten rhs) | op == A.Mul = multiplyOut' (flatten lhs) (flatten rhs)
| op == A.Rem = liftM2L (Modulo 1) (flatten lhs) (flatten rhs) | op == A.Rem = liftM2L (Modulo 1) (flatten lhs) (flatten rhs)
| op == A.Div = do rhs' <- flatten rhs | op == A.Div = do rhs' <- flatten rhs
case onlyConst rhs' of case onlyConst rhs' of
Just _ -> liftM2L (Divide 1) (flatten lhs) (return rhs') Just _ -> liftM2L (Divide 1) (flatten lhs) (return rhs')
-- Can't deal with variable divisors, leave expression as-is: -- Can't deal with variable divisors, leave expression as-is:
Nothing -> return [Scale 1 (e,0)] Nothing -> return [Scale 1 (e,0)]
| otherwise = throwError ("Unhandleable operator found in expression: " ++ show op) | otherwise = throwError ("Unhandleable operator found in expression: " ++ show op)
where where
-- liftM2L :: (Ord a, Ord b, Monad m) => (Set.Set a -> Set.Set b -> c) -> m [a] -> m [b] -> m [c] -- liftM2L :: (Ord a, Ord b, Monad m) => (Set.Set a -> Set.Set b -> c) -> m [a] -> m [b] -> m [c]
liftM2L f x y = liftM singleton $ liftM2 f (x >>= makeExpSet) (y >>= makeExpSet) liftM2L f x y = liftM singleton $ liftM2 f (x >>= makeExpSet) (y >>= makeExpSet)