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

Added a function to gather up a common pattern in ArrayUsageCheck

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

10
checks/ArrayUsageCheck.hs
View File

@ -260,6 +260,10 @@ makeEquations accesses bound
| otherwise = (b,s) | otherwise = (b,s)
setIndexVar' _ _ b e = (b,e) setIndexVar' _ _ b e = (b,e)
makeSingleEq :: A.Expression -> String -> StateT VarMap (Either String) EqualityConstraintEquation
makeSingleEq e desc = lift (flatten e) >>= makeEquation e (error $ "Type is irrelevant for " ++ desc)
>>= getSingleAccessItem ("Modulo or Divide not allowed in " ++ desc)
makeEquationWithPossibleRepBounds :: [(A.Variable, EqualityConstraintEquation, EqualityConstraintEquation)] -> makeEquationWithPossibleRepBounds :: [(A.Variable, EqualityConstraintEquation, EqualityConstraintEquation)] ->
ArrayAccess label -> StateT (VarMap) (Either String) (ArrayAccess label) ArrayAccess label -> StateT (VarMap) (Either String) (ArrayAccess label)
makeEquationWithPossibleRepBounds [] item = return item makeEquationWithPossibleRepBounds [] item = return item
@ -305,10 +309,8 @@ makeEquations accesses bound
makeRepVarEq :: (A.Replicator, Bool) -> StateT VarMap (Either String) (A.Variable, EqualityConstraintEquation, EqualityConstraintEquation) makeRepVarEq :: (A.Replicator, Bool) -> StateT VarMap (Either String) (A.Variable, EqualityConstraintEquation, EqualityConstraintEquation)
makeRepVarEq (A.For m varName from for, _) makeRepVarEq (A.For m varName from for, _)
= do from' <- lift (flatten from) >>= makeEquation from (error "Type is irrelevant for replication start") = do from' <- makeSingleEq from "replication start"
>>= getSingleAccessItem "Modulo or Divide not allowed in replication start" for' <- makeSingleEq for "replication count"
for' <- lift (flatten for) >>= makeEquation for (error "Type is irrelevant for replication count")
>>= getSingleAccessItem "Modulo or Divide not allowed in replication count"
return (A.Variable m varName, from', for') return (A.Variable m varName, from', for')
mkEq' :: [(A.Variable, EqualityConstraintEquation, EqualityConstraintEquation)] -> (ArrayAccessType, A.Expression) -> StateT [(CoeffIndex,CoeffIndex)] (StateT VarMap (Either String)) [(A.Expression, ArrayAccessType, (EqualityConstraintEquation, EqualityProblem, InequalityProblem))] mkEq' :: [(A.Variable, EqualityConstraintEquation, EqualityConstraintEquation)] -> (ArrayAccessType, A.Expression) -> StateT [(CoeffIndex,CoeffIndex)] (StateT VarMap (Either String)) [(A.Expression, ArrayAccessType, (EqualityConstraintEquation, EqualityProblem, InequalityProblem))]