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

Tidied up the error messages given when the array usage checker finds a problem

Browse Source
This commit is contained in:
Neil Brown 2008-01-16 03:37:53 +00:00
parent 1c0434cc47
commit b5606eb7a9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transformations/ArrayUsageCheck.hs
View File

@ -56,7 +56,7 @@ checkArrayUsage tree = (mapM_ checkPar $ listify (const True) tree) >> return tr
checkIndexes m (arrName, indexes) checkIndexes m (arrName, indexes)
= -- liftIO (putStr $ "Checking: " ++ show (arrName, indexes)) >> = -- liftIO (putStr $ "Checking: " ++ show (arrName, indexes)) >>
case makeEquations indexes (makeConstant emptyMeta 1000000) of case makeEquations indexes (makeConstant emptyMeta 1000000) of
Left err -> die $ "Could not work with array indexes for array \"" ++ arrName ++ "\": " ++ err Left err -> dieP m $ "Could not work with array indexes for array \"" ++ arrName ++ "\": " ++ err
Right [] -> return () -- No problems to work with Right [] -> return () -- No problems to work with
Right problems -> Right problems ->
case mapM (\(vm,p) -> seqPair (return vm,uncurry solveProblem p)) problems of case mapM (\(vm,p) -> seqPair (return vm,uncurry solveProblem p)) problems of
@ -81,8 +81,12 @@ checkArrayUsage tree = (mapM_ checkPar $ listify (const True) tree) >> return tr
showFlattenedExp :: FlattenedExp -> PassM String showFlattenedExp :: FlattenedExp -> PassM String
showFlattenedExp (Const n) = return $ show n showFlattenedExp (Const n) = return $ show n
showFlattenedExp (Scale n (A.Variable _ vn)) = do vn' <- getRealName vn showFlattenedExp (Scale n (A.Variable _ vn))
return $ (show n) ++ "*" ++ vn' = do vn' <- getRealName vn
case n of
1 -> return vn'
-1 -> return $ "-" ++ vn'
_ -> return $ (show n) ++ "*" ++ vn'
showFlattenedExp (Modulo top bottom) showFlattenedExp (Modulo top bottom)
= do top' <- showFlattenedExpSet top = do top' <- showFlattenedExpSet top
bottom' <- showFlattenedExpSet bottom bottom' <- showFlattenedExpSet bottom