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

Changed checkUnusedVar to use the new forAnyASTStructBottomUpAccum function

Browse Source
This commit is contained in:
Neil Brown 2008-11-24 10:30:30 +00:00
parent 0eab9a216d
commit 4af8845142
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checks/Check.hs
View File

@ -274,9 +274,9 @@ checkProcCallArgsUsage = mapM_ checkArgs . listify isProcCall
-- This isn't actually just unused variables, it's all unused names -- This isn't actually just unused variables, it's all unused names
checkUnusedVar :: CheckOptM () checkUnusedVar :: CheckOptM ()
checkUnusedVar = forAnyASTStructTopDown doSpec checkUnusedVar = forAnyASTStructBottomUpAccum doSpec
where where
doSpec :: Data a => A.Structured a -> CheckOptASTM (A.Structured a) () doSpec :: Data a => A.Structured a -> CheckOptASTM' [A.Name] (A.Structured a) ()
-- Don't touch PROCs, for now: -- Don't touch PROCs, for now:
doSpec (A.Spec _ (A.Specification mspec name (A.Proc {})) scope) = return () doSpec (A.Spec _ (A.Specification mspec name (A.Proc {})) scope) = return ()
doSpec (A.Spec _ (A.Specification mspec name _) scope) doSpec (A.Spec _ (A.Specification mspec name _) scope)
@ -284,7 +284,8 @@ checkUnusedVar = forAnyASTStructTopDown doSpec
-- checks that are not explicit in the AST. We'll have to move the -- checks that are not explicit in the AST. We'll have to move the
-- bounds checking forward into the AST before we can remove them: -- bounds checking forward into the AST before we can remove them:
when (not $ "_sizes" `isSuffixOf` A.nameName name) $ when (not $ "_sizes" `isSuffixOf` A.nameName name) $
let usedNames :: [A.Name] = fastListify (const True) scope in do usedNames <- askAccum >>* delete name
-- ^ strip off one use of each name, since it's used in the spec
when (not $ A.nameName name `elem` map A.nameName usedNames) $ when (not $ A.nameName name `elem` map A.nameName usedNames) $
do -- TODO have a way of not warning about compiler-generated names: do -- TODO have a way of not warning about compiler-generated names:
warnPC mspec WarnUnusedVariable $ formatCode "Unused variable: %" name warnPC mspec WarnUnusedVariable $ formatCode "Unused variable: %" name