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

Refactored a couple of clauses in the building of the control-flow graph

Browse Source
This commit is contained in:
Neil Brown 2007-10-28 17:04:45 +00:00
parent 5c4bf74a75
commit 49228150cf
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/FlowGraph.hs
View File

@ -135,24 +135,21 @@ buildFlowGraph blank f s
return (nStart, nEnd) return (nStart, nEnd)
_ -> return (-1,-1) _ -> return (-1,-1)
buildStructured _ (A.OnlyP _ p) = buildProcess p buildStructured _ (A.OnlyP _ p) = buildProcess p
buildStructured outer (A.OnlyO _ (A.Option m es p)) buildStructured outer (A.OnlyO _ opt)
= do nexp <- addNode' m (A.ExpressionList m es) = do (s,e) <-
(nbodys, nbodye) <- buildProcess p case opt of
addEdge ESeq nexp nbodys (A.Option m es p) -> do
nexp <- addNode' m (A.ExpressionList m es)
(nbodys, nbodye) <- buildProcess p
addEdge ESeq nexp nbodys
return (nexp,nbodye)
(A.Else _ p) -> buildProcess p
case outer of case outer of
Case (cStart, cEnd) -> Case (cStart, cEnd) ->
do addEdge ESeq cStart nexp do addEdge ESeq cStart s
addEdge ESeq nbodye cEnd addEdge ESeq e cEnd
_ -> throwError "Option found inside CASE statement" _ -> throwError "Option found outside CASE statement"
return (nexp,nbodye) return (s,e)
buildStructured outer (A.OnlyO _ (A.Else m p))
= do (nbodys, nbodye) <- buildProcess p
case outer of
Case (cStart, cEnd) ->
do addEdge ESeq cStart nbodys
addEdge ESeq nbodye cEnd
_ -> throwError "Option found inside CASE statement"
return (nbodys,nbodye)
buildStructured outer (A.Spec m spec str) buildStructured outer (A.Spec m spec str)
= do n <- addNode' m spec = do n <- addNode' m spec
(s,e) <- buildStructured outer str (s,e) <- buildStructured outer str