projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added global vector function generation
[matthijs/master-project/cλash.git]
/
Pretty.hs
diff --git
a/Pretty.hs
b/Pretty.hs
index eb8378c6c1e1f03e640ac9ec575c5d89229851b0..b2ac91ddb6e3334b4b075df407c96936d8855195 100644
(file)
--- a/
Pretty.hs
+++ b/
Pretty.hs
@@
-76,8
+76,8
@@
instance Pretty SigDef where
instance Pretty SignalExpr where
pPrint (EqLit id lit) =
parens $ pPrint id <> text " = " <> text lit
instance Pretty SignalExpr where
pPrint (EqLit id lit) =
parens $ pPrint id <> text " = " <> text lit
- pPrint (Literal lit) =
- text lit
+ pPrint (Literal lit
ty
) =
+ text
"(" <> text (show ty) <> text ") " <> text
lit
pPrint (Eq a b) =
parens $ pPrint a <> text " = " <> pPrint b
pPrint (Eq a b) =
parens $ pPrint a <> text " = " <> pPrint b
@@
-96,16
+96,16
@@
instance Pretty SigUse where
pPrint (SigStateNew n) = text "SN:" <> int n
pPrint SigSubState = text "s"
pPrint (SigStateNew n) = text "SN:" <> int n
pPrint SigSubState = text "s"
-instance Pretty
VHDL
Session where
- pPrint (
VHDLSession mod nameCount
funcs) =
+instance Pretty
Translator
Session where
+ pPrint (
TranslatorSession mod nameCount flat
funcs) =
text "Module: " $$ nest 15 (text modname)
$+$ text "NameCount: " $$ nest 15 (int nameCount)
text "Module: " $$ nest 15 (text modname)
$+$ text "NameCount: " $$ nest 15 (int nameCount)
- $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc (Map.toList funcs)))
+ $+$ text "Functions: " $$ nest 15 (vcat (map ppfunc (Map.toList f
latf
uncs)))
where
where
- ppfunc (hsfunc, f
data
) =
- pPrint hsfunc $+$ nest 5 (pPrint f
data
)
+ ppfunc (hsfunc, f
latfunc
) =
+ pPrint hsfunc $+$ nest 5 (pPrint f
latfunc
)
modname = showSDoc $ Module.pprModule (HscTypes.cm_module mod)
modname = showSDoc $ Module.pprModule (HscTypes.cm_module mod)
-
+{-
instance Pretty FuncData where
pPrint (FuncData flatfunc entity arch) =
text "Flattened: " $$ nest 15 (ppffunc flatfunc)
instance Pretty FuncData where
pPrint (FuncData flatfunc entity arch) =
text "Flattened: " $$ nest 15 (ppffunc flatfunc)
@@
-118,19
+118,13
@@
instance Pretty FuncData where
ppent Nothing = text "Nothing"
pparch Nothing = text "VHDL architecture not present"
pparch (Just _) = text "VHDL architecture present"
ppent Nothing = text "Nothing"
pparch Nothing = text "VHDL architecture not present"
pparch (Just _) = text "VHDL architecture present"
+-}
instance Pretty Entity where
instance Pretty Entity where
- pPrint (Entity id args res
decl pkg
) =
+ pPrint (Entity id args res) =
text "Entity: " $$ nest 10 (pPrint id)
$+$ text "Args: " $$ nest 10 (pPrint args)
$+$ text "Result: " $$ nest 10 (pPrint res)
text "Entity: " $$ nest 10 (pPrint id)
$+$ text "Args: " $$ nest 10 (pPrint args)
$+$ text "Result: " $$ nest 10 (pPrint res)
- $+$ ppdecl decl
- $+$ pppkg pkg
- where
- ppdecl Nothing = text "VHDL entity not present"
- ppdecl (Just _) = text "VHDL entity present"
- pppkg Nothing = text "VHDL package not present"
- pppkg (Just _) = text "VHDL package present"
instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Bind b) where
pPrint (CoreSyn.NonRec b expr) =
instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Bind b) where
pPrint (CoreSyn.NonRec b expr) =
@@
-138,6
+132,9
@@
instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Bind b) where
pPrint (CoreSyn.Rec binds) =
text "Rec: " $$ nest 10 (vcat $ map (prettyBind) binds)
pPrint (CoreSyn.Rec binds) =
text "Rec: " $$ nest 10 (vcat $ map (prettyBind) binds)
+instance (OutputableBndr b, Show b) => Pretty (CoreSyn.Expr b) where
+ pPrint = text . show
+
instance Pretty AST.VHDLId where
pPrint id = ForSyDe.Backend.Ppr.ppr id
instance Pretty AST.VHDLId where
pPrint id = ForSyDe.Backend.Ppr.ppr id
@@
-147,3
+144,10
@@
prettyBind (b, expr) =
where
b' = show b
expr' = show expr
where
b' = show b
expr' = show expr
+
+instance (Pretty k, Pretty v) => Pretty (Map.Map k v) where
+ pPrint =
+ vcat . map ppentry . Map.toList
+ where
+ ppentry (k, v) =
+ pPrint k <> text " : " $$ nest 15 (pPrint v)