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

Fixed another test that was broken during the change to Rep

Browse Source
This commit is contained in:
Neil Brown 2008-06-04 18:43:50 +00:00
parent a417708cda
commit 5bc88ec1fc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
transformations/PassTest.hs
View File

@ -597,7 +597,8 @@ testPullRepCounts = TestList
pullRepCounts (A.Seq emptyMeta $ A.Spec emptyMeta (A.Specification emptyMeta
(simpleName "i") $ A.Rep emptyMeta (A.For emptyMeta (intLiteral 0) (intLiteral 6))) $
A.Spec emptyMeta (A.Specification emptyMeta (simpleName "j") $ A.Rep emptyMeta (A.For emptyMeta (intLiteral 0) (intLiteral 8))) $ A.Several emptyMeta [])
A.Spec emptyMeta (A.Specification emptyMeta (simpleName "j") $
A.Rep emptyMeta (A.For emptyMeta (intLiteral 0) (intLiteral 8))) $ A.Several emptyMeta [])
(return ())
]
where

7
transformations/SimplifyExprs.hs
View File

@ -164,16 +164,19 @@ pullRepCounts = pass "Pull up replicator counts for SEQs"
doProcess :: A.Process -> PassM A.Process
doProcess (A.Seq m s) = pullRepCountSeq s >>* A.Seq m
doProcess p = return p
-- Don't want to apply this using applyDepthM, because then nested PARs
-- inside the SEQ would also be processed, which is unnecessary
pullRepCountSeq :: A.Structured A.Process -> PassM (A.Structured A.Process)
pullRepCountSeq s@(A.Only _ _) = return s
pullRepCountSeq (A.Spec m (A.Specification mspec n (A.Rep mrep (A.For mfor
from for))) scope)
= do t <- astTypeOf for
spec@(A.Specification _ nonceName _) <- makeNonceIsExpr "rep_for" mspec t for
scope' <- pullRepCountSeq scope
return $ A.Spec mspec spec $
A.Spec m (A.Specification mspec n (A.Rep mrep
(A.For mfor from (A.ExprVariable mspec $ A.Variable mspec nonceName)))) scope
(A.For mfor from (A.ExprVariable mspec $ A.Variable mspec nonceName)))) scope'
pullRepCountSeq (A.Spec m sp str)
= do str' <- pullRepCountSeq str
return $ A.Spec m sp str'