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

Fixed transformConstr to work with the new helper functions

Browse Source
This commit is contained in:
Neil Brown 2009-04-07 16:10:42 +00:00
parent 8a35da4be4
commit ca3c982a7e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
transformations/SimplifyExprs.hs
View File

@ -259,9 +259,11 @@ transformConstr = pass "Transform array constructors into initialisation code"
-- to it:
modifyName n $ \nd -> nd {A.ndAbbrevMode = A.Original}
incIndex <- incrementIndex indexVar
let body = specs $ A.Several m''
[ assignItem tInner indexVar repExp'
, incrementIndex indexVar ]
, incIndex ]
body' <- applyDepthSM doStructured body
return $ declDest $ A.ProcThen m''
@ -294,9 +296,10 @@ transformConstr = pass "Transform array constructors into initialisation code"
assignIndex0 indexVar = A.Only m'' $ A.Assign m'' [indexVar] $
A.ExpressionList m'' [A.Literal m'' A.Int $ A.IntLiteral m'' "0"]
incrementIndex :: A.Variable -> A.Structured A.Process
incrementIndex indexVar = A.Only m'' $ A.Assign m'' [indexVar] $
A.ExpressionList m'' [addOne $ A.ExprVariable m'' indexVar]
incrementIndex :: A.Variable -> PassM (A.Structured A.Process)
incrementIndex indexVar
= do indexVar_plus1 <- addOne $ A.ExprVariable m'' indexVar
return $ A.Only m'' $ A.Assign m'' [indexVar] $ A.ExpressionList m'' [indexVar_plus1]
assignItem :: A.Type -> A.Variable -> A.Structured A.Expression -> A.Structured A.Process
assignItem t' indexVar repExp' = A.Only m'' $ A.Assign m'' [A.SubscriptedVariable m''
@ -309,9 +312,11 @@ transformConstr = pass "Transform array constructors into initialisation code"
appendItem :: A.Structured A.Process
appendItem = A.Only m'' $ A.Assign m'' [A.Variable m'' n] $
A.ExpressionList m'' [A.Dyadic m'' A.Concat
(A.ExprVariable m'' $ A.Variable m'' n)
(A.Literal m'' (let A.List tInner = t in tInner) $ A.ArrayListLiteral m'' repExp)]
A.ExpressionList m'' [A.FunctionCall m'' (A.Name m'' "++")
[A.ExprVariable m'' $ A.Variable m'' n
,A.Literal m'' (let A.List tInner = t in tInner) $ A.ArrayListLiteral m'' repExp
]]
replicateCode :: Data a => A.Structured a -> A.Structured a
replicateCode = A.Spec m'' (A.Specification m'' repn (A.Rep m'' rep))