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

Added support for recording conditional expressions in the flow graph (based on IF and WHILE, at least)

Browse Source
This commit is contained in:
Neil Brown 2008-06-07 20:28:04 +00:00
parent 6f23920e69
commit 70139ad072
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flow/FlowGraph.hs
View File

@ -289,10 +289,12 @@ buildStructuredIf (prev, end) (A.Spec _ spec str) route
buildOnlyChoice :: (Monad mLabel, Monad mAlter) => (Node, Node) -> ASTModifier mAlter A.Choice structType -> A.Choice -> GraphMaker mLabel mAlter label structType Node buildOnlyChoice :: (Monad mLabel, Monad mAlter) => (Node, Node) -> ASTModifier mAlter A.Choice structType -> A.Choice -> GraphMaker mLabel mAlter label structType Node
buildOnlyChoice (cPrev, cEnd) route (A.Choice m exp p) buildOnlyChoice (cPrev, cEnd) route (A.Choice m exp p)
= do nexp <- addNodeExpression (findMeta exp) exp $ route23 route A.Choice = do nexp <- addNode' (findMeta exp) labelConditionalExpression exp
$ AlterExpression $ route23 route A.Choice
(nbodys, nbodye) <- buildProcess p $ route33 route A.Choice (nbodys, nbodye) <- buildProcess p $ route33 route A.Choice
nexp --> nbodys addEdge (ESeq $ Just True) nexp nbodys
cPrev --> nexp addEdge (ESeq $ Just False) cPrev nexp -- Not technically a false branch, if
-- node before was the dummy node at the start of the IF
nbodye --> cEnd nbodye --> cEnd
return nexp return nexp
@ -317,6 +319,8 @@ buildOnlyAlternative route alt
= do let (m,p,r) = case alt of = do let (m,p,r) = case alt of
(A.Alternative m _ _ _ p) -> (m,p, route55 route A.Alternative) (A.Alternative m _ _ _ p) -> (m,p, route55 route A.Alternative)
(A.AlternativeSkip m _ p) -> (m,p, route33 route A.AlternativeSkip) (A.AlternativeSkip m _ p) -> (m,p, route33 route A.AlternativeSkip)
-- TODO label the pre-conditions, and use separate nodes for
-- them
guardNode <- addNode' m labelAlternative alt (AlterAlternative route) guardNode <- addNode' m labelAlternative alt (AlterAlternative route)
(bodyNodeStart, bodyNodeEnd) <- buildProcess p r (bodyNodeStart, bodyNodeEnd) <- buildProcess p r
guardNode --> bodyNodeStart guardNode --> bodyNodeStart
@ -349,12 +353,15 @@ buildProcess (A.Par m _ s) route
do addEdge (EStartPar pId) nStart start do addEdge (EStartPar pId) nStart start
addEdge (EEndPar pId) end nEnd addEdge (EEndPar pId) end nEnd
return (nStart, nEnd) return (nStart, nEnd)
buildProcess (A.While _ e p) route buildProcess (A.While m e p) route
= do n <- addNodeExpression (findMeta e) e (route23 route A.While) = do n <- addNode' (findMeta e) labelConditionalExpression e (AlterExpression
$ route23 route A.While)
nAfter <- addDummyNode m
(start, end) <- buildProcess p (route33 route A.While) (start, end) <- buildProcess p (route33 route A.While)
n --> start addEdge (ESeq $ Just True) n start
addEdge (ESeq $ Just False) n nAfter
end --> n end --> n
return (n, n) return (n, nAfter)
buildProcess (A.Case m e s) route buildProcess (A.Case m e s) route
= do nStart <- addNodeExpression (findMeta e) e (route23 route A.Case) = do nStart <- addNodeExpression (findMeta e) e (route23 route A.Case)
nEnd <- addDummyNode m nEnd <- addDummyNode m