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

Moved addEq to the top-level of ArrayUsageCheck

Browse Source
This commit is contained in:
Neil Brown 2008-02-03 12:41:16 +00:00
parent 9c0dcb6008
commit a856d39604
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checks/ArrayUsageCheck.hs
View File

@ -510,6 +510,9 @@ pairEqsAndBounds items bounds = (concatMap (uncurry pairEqs) . allPairs) items +
-> Maybe (EqualityProblem, InequalityProblem) -> Maybe (EqualityProblem, InequalityProblem)
pairEqs' (AARead,_) (AARead,_) = Nothing pairEqs' (AARead,_) (AARead,_) = Nothing
pairEqs' (_,(ex,eqX,ineqX)) (_,(ey,eqY,ineqY)) = Just ([arrayZipWith' 0 (-) ex ey] ++ eqX ++ eqY, ineqX ++ ineqY ++ getIneqs bounds [ex,ey]) pairEqs' (_,(ex,eqX,ineqX)) (_,(ey,eqY,ineqY)) = Just ([arrayZipWith' 0 (-) ex ey] ++ eqX ++ eqY, ineqX ++ ineqY ++ getIneqs bounds [ex,ey])
addEq :: EqualityConstraintEquation -> EqualityConstraintEquation -> EqualityConstraintEquation
addEq = arrayZipWith' 0 (+)
-- | Given a (low,high) bound (typically: array dimensions), and a list of equations ex, -- | Given a (low,high) bound (typically: array dimensions), and a list of equations ex,
-- forms the possible inequalities: -- forms the possible inequalities:
@ -523,8 +526,7 @@ getIneqs (low, high) = concatMap getLH
getLH :: EqualityConstraintEquation -> [InequalityConstraintEquation] getLH :: EqualityConstraintEquation -> [InequalityConstraintEquation]
getLH eq = [eq `addEq` (amap negate low),high `addEq` amap negate eq] getLH eq = [eq `addEq` (amap negate low),high `addEq` amap negate eq]
addEq :: EqualityConstraintEquation -> EqualityConstraintEquation -> EqualityConstraintEquation
addEq = arrayZipWith' 0 (+)
-- | Given an expression, forms equations (and accompanying additional equation-sets) and returns it -- | Given an expression, forms equations (and accompanying additional equation-sets) and returns it
makeEquation :: label -> ArrayAccessType -> [FlattenedExp] -> StateT VarMap (Either String) (ArrayAccess label) makeEquation :: label -> ArrayAccessType -> [FlattenedExp] -> StateT VarMap (Either String) (ArrayAccess label)