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

Added tests for while loops in the control-flow graph

Browse Source
This commit is contained in:
Neil Brown 2007-10-28 12:39:26 +00:00
parent cde83c83ae
commit b6d525fbb8
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/FlowGraph.hs
View File

@ -27,7 +27,12 @@ import qualified AST as A
import Metadata
import Utils
data EdgeLabel = EChoice | ESeq | EPar deriving (Show, Eq, Ord)
-- | A node will either have zero links out, one or more Seq links, or one or more Par links.
-- Zero links means it is a terminal node.
-- One Seq link means a normal sequential progression.
-- Multiple Seq links means choice.
-- Multiple Par links means a parallel branch.
data EdgeLabel = ESeq | EPar deriving (Show, Eq, Ord)
data OuterType = None | Seq | Par
@ -112,6 +117,12 @@ buildFlowGraph blank f s
-- buildProcess :: A.Process -> GraphMaker m a (Node, Node)
buildProcess (A.Seq _ s) = buildStructured Seq s
buildProcess (A.Par _ _ s) = buildStructured Par s
buildProcess (A.While m e p)
= do n <- addNode' m e
(start, end) <- buildProcess p
addEdge ESeq n start
addEdge ESeq end n
return (n, n)
buildProcess p = do val <- (lift . lift) (f p)
(liftM mkPair) $ addNode (findMeta p, val)
@ -120,5 +131,5 @@ buildFlowGraph blank f s
-- So rather than using generics, we could have a small function dictionary instead.
-- Types definitely applied to:
-- A.Specification, A.Process
-- A.Specification, A.Process, A.Expression

16
common/FlowGraphTest.hs
View File

@ -49,6 +49,8 @@ m8 = makeMeta 8
m9 = makeMeta 9
m10 = makeMeta 10
m11 = makeMeta 11
-- For meta tags that shouldn't be used in the graph:
mU = makeMeta (-1)
sub :: Meta -> Int -> Meta
sub m n = m {metaColumn = n}
@ -164,7 +166,18 @@ testPar = TestList
testPar' :: Int -> [(Int, Meta)] -> [(Int, Int, EdgeLabel)] -> A.Structured -> Test
testPar' n a b s = testGraph ("testPar " ++ show n) a b (A.Par m0 A.PlainPar s)
--TODO test while loops
testWhile :: Test
testWhile = TestList
[
testGraph "testWhile 0" [(0,m0), (1,m1)] [(0,1,ESeq), (1,0,ESeq)] (A.While m0 (A.True m10) sm1)
,testGraph "testWhile 1" [(2,m2), (3, m3), (5, m5)] [(2,3,ESeq), (3,2,ESeq), (2,5,ESeq)]
(A.Seq m0 $ A.Several m1 [A.OnlyP m9 $ A.While m2 (A.True m10) sm3,A.OnlyP m4 sm5])
,testGraph "testWhile 2" [(2,m2), (3, m3), (5, m5), (7, m7)] [(7,2,ESeq), (2,3,ESeq), (3,2,ESeq), (2,5,ESeq)]
(A.Seq m0 $ A.Several m1 [A.OnlyP m6 sm7,A.OnlyP m9 $ A.While m2 (A.True m10) sm3,A.OnlyP m4 sm5])
,testGraph "testWhile 3" [(2,m2), (3, m3), (5, m5), (7, m7), (9, m9)] [(7,2,ESeq), (2,3,ESeq), (3,9,ESeq), (9,2,ESeq), (2,5,ESeq)]
(A.Seq m0 $ A.Several m1 [A.OnlyP m6 sm7,A.OnlyP mU $ A.While m2 (A.True mU) $ A.Seq mU $ A.Several mU [A.OnlyP mU sm3,A.OnlyP mU sm9],A.OnlyP m4 sm5])
]
--TODO test replicated seq/par
--TODO test ifs and cases
--TODO test alts
@ -175,4 +188,5 @@ tests = TestList
[
testSeq
,testPar
,testWhile
]