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

Moved the remainder of the checkInitVar tests over to the new system

Browse Source
This commit is contained in:
Neil Brown 2008-11-19 17:25:02 +00:00
parent 3b57d43eb6
commit 38374320a3
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
checks/UsageCheckTest.hs
View File

@ -216,39 +216,35 @@ testInitVar = TestList
,oX *:= oX ,oX *:= oX
] ]
-- Test loops (0 -> 1, 1 -> 2 -> 3 -> 1, 1 -> 4) ,test "Sandwiched loop" $ wrap $
-- Loop, nothing happens: oSEQ [
,testInitVarPass 100 [(0,[],[]),(1,[],[]),(2,[],[]),(3,[],[]),(4,[],[])] decl (return A.Int) oX [
[(0,1,ESeq Nothing), (1,2,ESeq Nothing), (2,3,ESeq Nothing), (3,1,ESeq Nothing), (1,4,ESeq Nothing)] 0 4 "x" oX *:= (return (3::Int))
-- Loop, written to before the loop, read afterwards: ,oWHILE False oSKIP
,testInitVarPass 101 [(0,[],[variable "x"]),(1,[],[]),(2,[],[]),(3,[],[]),(4,[variable "x"],[])] ,oX *:= oX
[(0,1,ESeq Nothing), (1,2,ESeq Nothing), (2,3,ESeq Nothing), (3,1,ESeq Nothing), (1,4,ESeq Nothing)] 0 4 "x" ]]
-- Loop, written to before the loop, read during the loop ,test "Read during loop, written before" $ wrap $
,testInitVarPass 102 [(0,[],[variable "x"]),(1,[],[]),(2,[],[]),(3,[variable "x"],[]),(4,[],[])] oSEQ [
[(0,1,ESeq Nothing), (1,2,ESeq Nothing), (2,3,ESeq Nothing), (3,1,ESeq Nothing), (1,4,ESeq Nothing)] 0 4 "x" decl (return A.Int) oX [
-- Loop, written to during the loop, read afterwards (FAIL - loop might not be executed) oX *:= (return (3::Int))
,testInitVarFail 103 [(0,[],[]),(1,[],[]),(2,[],[variable "x"]),(3,[],[]),(4,[variable "x"],[])] ,oWHILE False $ oX *:= oX
[(0,1,ESeq Nothing), (1,2,ESeq Nothing), (2,3,ESeq Nothing), (3,1,ESeq Nothing), (1,4,ESeq Nothing)] 0 4 "x" ]]
-- Loop, written to and then read during the loop: ,testWarn "Read during loop, not written before" $ wrap $
,testInitVarPass 104 [(0,[],[]),(1,[],[]),(2,[],[variable "x"]),(3,[variable "x"],[]),(4,[],[])] oSEQ [
[(0,1,ESeq Nothing), (1,2,ESeq Nothing), (2,3,ESeq Nothing), (3,1,ESeq Nothing), (1,4,ESeq Nothing)] 0 4 "x" decl (return A.Int) oX [
-- Loop, read then written to during the loop (FAIL): oWHILE False $ oX *:= oX
,testInitVarFail 105 [(0,[],[]),(1,[],[]),(2,[variable "x"],[]),(3,[],[variable "x"]),(4,[],[])] ]]
[(0,1,ESeq Nothing), (1,2,ESeq Nothing), (2,3,ESeq Nothing), (3,1,ESeq Nothing), (1,4,ESeq Nothing)] 0 4 "x" ,testWarn "Written during loop, read after, not written before" $ wrap $
oSEQ [
decl (return A.Int) oX [
oWHILE False $ oX *:= oX
,oX *:= oX
]]
-- TODO work out (and test) par loops
-- TODO test dereferenced variables -- TODO test dereferenced variables
] ]
where where
testInitVarPass :: Int -> [(Int, [Var], [Var])] -> [(Int, Int, EdgeLabel)] -> Int -> Int -> String -> Test
testInitVarPass testNum ns es start end v = TestCase $ assertEither ("testInitVar " ++ show testNum) () $ flip runReaderT emptyState $ checkInitVar emptyMeta (buildTestFlowGraph ns es start end v) (-1)
testInitVarFail :: Int -> [(Int, [Var], [Var])] -> [(Int, Int, EdgeLabel)] -> Int -> Int -> String -> Test
testInitVarFail testNum ns es start end v = TestCase $ assertEitherFail ("testInitVar " ++ show testNum) $ flip runReaderT emptyState $ checkInitVar emptyMeta (buildTestFlowGraph ns es start end v) (-1)
variable = Var . A.Variable emptyMeta . simpleName
wrap x = oPROC "foo" [] x oempty wrap x = oPROC "foo" [] x oempty
test, testWarn :: String -> Occ A.AST -> Test test, testWarn :: String -> Occ A.AST -> Test

9
common/OccamEDSL.hs
View File

@ -18,7 +18,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
-- | The necessary components for using an occam EDSL (for building test-cases). -- | The necessary components for using an occam EDSL (for building test-cases).
module OccamEDSL (ExpInp, ExpInpT, module OccamEDSL (ExpInp, ExpInpT,
oSEQ, oPAR, oPROC, oSKIP, oINT, oSEQ, oPAR, oPROC, oSKIP, oINT, oWHILE,
oCASE, oCASEinput, caseOption, inputCaseOption, oCASE, oCASEinput, caseOption, inputCaseOption,
oALT, guard, oALT, guard,
oIF, ifChoice, oIF, ifChoice,
@ -229,6 +229,13 @@ ifChoice (e, body)
body' <- body body' <- body
return $ makePlain $ A.Choice emptyMeta e' body' return $ makePlain $ A.Choice emptyMeta e' body'
oWHILE :: (CanBeExpression e, Castable r A.Process) => e -> O A.Process -> O r
oWHILE e body
= do e' <- liftExpInp $ expr e
body' <- body
return $ makePlain $ A.While emptyMeta e' body'
singlify :: Data a => A.Structured a -> A.Structured a singlify :: Data a => A.Structured a -> A.Structured a
singlify (A.Several _ [s]) = s singlify (A.Several _ [s]) = s
singlify ss = ss singlify ss = ss