@@ -28,7 +28,10 @@ import qualified Transform.Canonicalize.Type as Canonicalize
2828import qualified Transform.Interface as Interface
2929
3030
31−environment :: Module.Interfaces -> Module.ValidModule -> Canonicalizer [Doc] Environment
31+environment
32+ :: Module.Interfaces
33+ -> Module.ValidModule
34+ -> Canonicalizer [Doc] Environment
3235environment interfaces modul@(Module.Module _ _ _ imports decls) =
3336 do () <- allImportsAvailable
3437 let moduleName =
@@ -186,12 +189,23 @@ node name tvars alias =
186189 where
187190 edges tipe =
188191 case tipe of
189− Type.Lambda t1 t2 -> edges t1 ++ edges t2
190− Type.Var _ -> []
191− Type.Type (Var.Raw x) -> [x]
192− Type.App t ts -> edges t ++ concatMap edges ts
193− Type.Record fs ext -> maybe [] edges ext ++ concatMap (edges . snd) fs
194− Type.Aliased _ t -> edges t
192+ Type.Lambda t1 t2 ->
193+ edges t1 ++ edges t2
194+
195+ Type.Var _ ->
196+ []
197+
198+ Type.Type (Var.Raw x) ->
199+ [x]
200+
201+ Type.App t ts ->
202+ edges t ++ concatMap edges ts
203+
204+ Type.Record fs ext ->
205+ maybe [] edges ext ++ concatMap (edges . snd) fs
206+
207+ Type.Aliased _ t ->
208+ edges t
195209
196210
197211addTypeAliases
@@ -233,22 +247,23 @@ addTypeAlias moduleName env scc =
233247
234248typeAlias
235249 :: (String, [String], Type.Type var)
236− -> D.Declaration' port def var
250+ -> D.Declaration' wire def var
237251typeAlias (n,ts,t) =
238252 D.TypeAlias n ts t
239253
240254
241255datatype
242256 :: (String, [String], Type.Type var)
243− -> D.Declaration' port def var
257+ -> D.Declaration' wire def var
244258datatype (n,ts,t) =
245259 D.Datatype n ts [(n,[t])]
246260
247261
248262indented :: [D.ValidDecl] -> Doc
249−indented decls = P.vcat (map prty decls) <> P.text "\n"
250− where
251− prty decl = P.text "\n " <> pretty decl
263+indented decls =
264+ P.vcat (map prty decls) <> P.text "\n"
265+ where
266+ prty decl = P.text "\n " <> pretty decl
252267
253268
254269mutuallyRecursiveMessage :: String
@@ -317,4 +332,5 @@ addDecl moduleName info@(nodes,env) decl =
317332 addLocal (D.wireName wire) (_values env)
318333 }
319334
320− D.Fixity _ _ _ -> info
335+ D.Fixity _ _ _ ->
336+ info