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

Fixed a missing case (an empty array) in one of the occam passes

Browse Source
This commit is contained in:
Neil Brown 2009-02-02 23:51:37 +00:00
parent ec1341849d
commit 0bffd42cad
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontends/OccamPasses.hs
View File

@ -63,7 +63,12 @@ fixConstructorTypes = occamOnlyPass "Fix the types of array constructors"
getDims (A.Array ds _) = ds getDims (A.Array ds _) = ds
getDims t = error $ "Cannot deduce dimensions of array constructor: " ++ show t getDims t = error $ "Cannot deduce dimensions of array constructor: " ++ show t
innerType :: A.Type -> A.Type
innerType (A.Array _ t) = t
innerType t = error $ "Cannot deduce dimensions of array constructor: " ++ show t
doExpr :: [A.Dimension] -> [A.Dimension] -> A.Structured A.Expression -> PassM A.Type doExpr :: [A.Dimension] -> [A.Dimension] -> A.Structured A.Expression -> PassM A.Type
doExpr prev (d:_) (A.Several m []) = return $ A.Array (prev ++ [d]) $ innerType prevT
doExpr prev (d:dims) (A.Several m ss@(s:_)) doExpr prev (d:dims) (A.Several m ss@(s:_))
= doExpr (prev ++ [d]) dims s = doExpr (prev ++ [d]) dims s
doExpr prev _ (A.Only _ e) doExpr prev _ (A.Only _ e)
@ -73,6 +78,8 @@ fixConstructorTypes = occamOnlyPass "Fix the types of array constructors"
= doExpr (prev ++ [count]) (dims) body = doExpr (prev ++ [count]) (dims) body
where where
count = A.Dimension $ countReplicator rep count = A.Dimension $ countReplicator rep
doExpr _ dims s = diePC (findMeta s) $ formatCode
("fixConstructorTypes found unexpected: %, " ++ show s) dims
doExpression e = return e doExpression e = return e