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

Fixed a bug in the occam type inference where channels of arrays were not being processed properly

Browse Source
This commit is contained in:
Neil Brown 2009-02-27 17:01:07 +00:00
parent cd1b409f96
commit c787aa9fa5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontends/OccamTypes.hs
View File

@ -54,6 +54,10 @@ sameType (A.Array (A.Dimension e1 : ds1) t1)
sameType (A.Array (A.UnknownDimension : ds1) t1)
(A.Array (A.UnknownDimension : ds2) t2)
= sameType (A.Array ds1 t1) (A.Array ds2 t2)
-- We might be dealing with channels of arrays, so we must dig through channels:
sameType (A.Chan _ ta) (A.Chan _ tb) = sameType ta tb
sameType (A.ChanEnd dira _ ta) (A.ChanEnd dirb _ tb)
= liftM (dira == dirb &&) (sameType ta tb)
sameType a b = return $ a == b
-- | Check that the second dimension can be used in a context where the first
@ -879,18 +883,21 @@ inferTypes = occamOnlyPass "Infer types"
return $ A.Proc m sm fs' body'
where
processFormal body f@(A.Formal am t n)
= case t of
A.Chan attr t ->
= do t' <- recurse t
case t' of
A.Chan attr innerT ->
do dirs <- findDir n body
case nub dirs of
[dir] ->
do let t' = A.ChanEnd dir attr t
do let t' = A.ChanEnd dir attr innerT
f' = A.Formal am t' n
modifyName n (\nd -> nd {A.ndSpecType =
A.Declaration m t'})
return f'
_ -> return f -- no direction, or two
_ -> return f
_ -> return $ A.Formal am t' n -- no direction, or two
_ -> do modifyName n (\nd -> nd {A.ndSpecType =
A.Declaration m t'})
return $ A.Formal am t' n
_ -> lift $ descend st
where
-- | This is a bit ugly: walk down a Structured to find the single