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

Altered transformEachRange to make it more straight-forward

Browse Source
This commit is contained in:
Neil Brown 2008-03-20 09:36:26 +00:00
parent 713b5c3e5c
commit ad7a76dace
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontends/RainPasses.hs
View File

@ -189,14 +189,10 @@ transformEachRange = doGeneric `ext1M` doStructured
doStructured :: Data a => A.Structured a -> PassM (A.Structured a) doStructured :: Data a => A.Structured a -> PassM (A.Structured a)
doStructured (A.Rep repMeta (A.ForEach eachMeta loopVar (A.ExprConstr doStructured (A.Rep repMeta (A.ForEach eachMeta loopVar (A.ExprConstr
_ (A.RangeConstr _ _ (A.Literal _ _ begin) (A.Literal _ _ end)))) body) _ (A.RangeConstr _ _ begin end))) body)
= do body' <- doStructured body = do body' <- doStructured body
-- TODO should probably not do mini-constant-folding here: return $ A.Rep repMeta (A.For eachMeta loopVar begin
if (isJust $ checkIntegral begin) && (isJust $ checkIntegral end) (addOne $ subExprs end begin)) body'
then return $ A.Rep repMeta (A.For eachMeta loopVar (A.Literal eachMeta A.Int begin)
(A.Literal eachMeta A.Int $ A.IntLiteral eachMeta $ show ((fromJust $ checkIntegral end) - (fromJust $ checkIntegral begin) + 1))
) body'
else dieP eachMeta "Items in range constructor (x..y) are not integer literals"
doStructured s = doGeneric s doStructured s = doGeneric s
-- | A pass that changes all the Rain range constructor expressions into the more general array constructor expressions -- | A pass that changes all the Rain range constructor expressions into the more general array constructor expressions