luke
/
sv2v
mirror of https://github.com/zachjs/sv2v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Struct conversion handling of default patterns with struct arrays

This commit is contained in:
Zachary Snow 2019-04-18 21:00:43 -04:00
parent 68b6eae484
commit 093a4d4dd9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Convert/Struct.hs
View File

@ -213,8 +213,20 @@ convertAsgn structs types (lhs, expr) =
where e' = convertExpr (IntegerVector t sg rs) e where e' = convertExpr (IntegerVector t sg rs) e
convertExpr (Struct (Packed sg) fields (_:rs)) (Bit e _) = convertExpr (Struct (Packed sg) fields (_:rs)) (Bit e _) =
convertExpr (Struct (Packed sg) fields rs) e convertExpr (Struct (Packed sg) fields rs) e
convertExpr (t @ (Struct (Packed _) fields _)) (Pattern [(Just "default", e)]) = convertExpr (Struct (Packed sg) fields rs) (Pattern [(Just "default", e)]) =
convertExpr t $ Pattern $ take (length fields) (repeat (Nothing, e)) if Map.notMember structTf structs then
Pattern [(Just "default", e)]
else if null rs then
expanded
else if length rs == 1 then
Repeat (rangeSize $ head rs) [expanded]
else
error $ "default pattern for multi-dimensional struct array "
++ show structTf ++ " is not allowed"
where
structTf = Struct (Packed sg) fields
expanded = convertExpr (structTf []) $ Pattern $
take (length fields) (repeat (Nothing, e))
convertExpr (Struct (Packed sg) fields []) (Pattern itemsOrig) = convertExpr (Struct (Packed sg) fields []) (Pattern itemsOrig) =
if length items /= length fields then if length items /= length fields then
error $ "struct pattern " ++ show items ++ error $ "struct pattern " ++ show items ++