@@ -10,7 +10,7 @@ import qualified Type.Solve as Solve
11import AST.Module as Module
11import AST.Module as Module
12import AST.Annotation (noneNoDocs)
12import AST.Annotation (noneNoDocs)
13−import AST.Type (Type)
13+import AST.Type (CanonicalType)
14import Text.PrettyPrint
14import Text.PrettyPrint
15import qualified Type.State as TS
15import qualified Type.State as TS
16import qualified Type.ExtraChecks as Check
16import qualified Type.ExtraChecks as Check
@@ -22,7 +22,7 @@ import System.IO.Unsafe -- Possible to switch over to the ST monad instead of
22 -- the IO monad. I don't think that'd be worthwhile.
22 -- the IO monad. I don't think that'd be worthwhile.
25−infer :: Interfaces -> MetadataModule -> Either [Doc] (Map.Map String Type)
25+infer :: Interfaces -> CanonicalModule -> Either [Doc] (Map.Map String CanonicalType)
26infer interfaces modul = unsafePerformIO $ do
26infer interfaces modul = unsafePerformIO $ do
27 env <- Env.initialEnvironment
27 env <- Env.initialEnvironment
28 (datatypes modul ++ concatMap iAdts (Map.elems interfaces))
28 (datatypes modul ++ concatMap iAdts (Map.elems interfaces))