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

Fixed the pulling up of replication counts to pull up outside PARs

Browse Source
This commit is contained in:
Neil Brown 2009-03-27 21:29:30 +00:00
parent 5316bc379f
commit a71e2a8c0a
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
transformations/SimplifyExprs.hs
View File

@ -169,21 +169,31 @@ pullRepCounts :: Pass
pullRepCounts = pass "Pull up replicator counts for SEQs, PARs and ALTs" pullRepCounts = pass "Pull up replicator counts for SEQs, PARs and ALTs"
(Prop.agg_namesDone ++ Prop.agg_typesDone) (Prop.agg_namesDone ++ Prop.agg_typesDone)
[] []
(applyDepthM2 (applyDepthM pullRepCountProc)
(pullRepCount :: A.Structured A.Process -> PassM (A.Structured A.Process))
(pullRepCount :: A.Structured A.Alternative -> PassM (A.Structured A.Alternative))
)
where where
pullRepCount :: Data a => A.Structured a -> PassM (A.Structured a) pullRepCountStr :: Data a => Bool -> A.Structured a
pullRepCount (A.Spec m (A.Specification mspec n (A.Rep mrep (A.For mfor -> StateT (A.Structured A.Process -> A.Structured A.Process)
PassM (A.Structured a)
pullRepCountStr addHere (A.Spec m (A.Specification mspec n (A.Rep mrep (A.For mfor
from for step))) scope) from for step))) scope)
= do t <- astTypeOf for = do t <- lift $ astTypeOf for
spec@(A.Specification _ nonceName _) <- makeNonceIsExpr "rep_for" mspec t for spec@(A.Specification _ nonceName _) <- lift $ makeNonceIsExpr "rep_for" mspec t for
let newSpec = (A.Rep mrep (A.For mfor from (A.ExprVariable mspec $ A.Variable mspec nonceName) step)) let newRepSpec = (A.Rep mrep (A.For mfor from (A.ExprVariable mspec $ A.Variable mspec nonceName) step))
modifyName n $ \nd -> nd { A.ndSpecType = newSpec } lift $ modifyName n $ \nd -> nd { A.ndSpecType = newRepSpec }
return $ A.Spec mspec spec $ if addHere
A.Spec m (A.Specification mspec n newSpec) scope then return $ A.Spec mspec spec $
pullRepCount s = return s A.Spec m (A.Specification mspec n newRepSpec) scope
else do modify (. A.Spec mspec spec)
return $ A.Spec m (A.Specification mspec n newRepSpec) scope
pullRepCountStr _ s = return s
pullRepCountProc :: Transform A.Process
pullRepCountProc (A.Alt m p body) = evalStateT (pullRepCountStr True body) id >>* A.Alt m p
pullRepCountProc (A.Seq m body) = evalStateT (pullRepCountStr True body) id >>* A.Seq m
pullRepCountProc (A.Par m p body)
= do (body', spec) <- runStateT (pullRepCountStr False body) id
return $ A.Seq m $ spec $ A.Only m $ A.Par m p body'
pullRepCountProc p = return p
transformConstr :: Pass transformConstr :: Pass
transformConstr = pass "Transform array constructors into initialisation code" transformConstr = pass "Transform array constructors into initialisation code"