@@ -9,24 +9,28 @@ import System.FilePath as FP
99import Text.PrettyPrint (Doc)
1010
1111import SourceSyntax.Everything
12−import SourceSyntax.Declaration (Assoc)
13−import qualified SourceSyntax.Location as Loc
12+import SourceSyntax.Type
1413import qualified Parse.Parse as Parse
1514import qualified Metadata.Libraries as Libs
16−import qualified Transform.Optimize as Optimize
1715import qualified Transform.Check as Check
1816import qualified Transform.SortDefinitions as SD
1917import qualified Type.Inference as TI
2018import qualified Type.Constrain.Declaration as TcDecl
2119
2220
23−buildFromSource :: (Data t, Data v) => Bool -> String -> Either [Doc] (MetadataModule t v)
24−buildFromSource noPrelude src =
25− do modul@(Module _ _ _ decls) <- Parse.program src
21+type TypeLibrary = Map.Map String (Map.Map String Type)
22+
23+buildFromSource ::
24+ (Data t, Data v) =>
25+ TypeLibrary ->
26+ String ->
27+ Either [Doc] (MetadataModule t v)
28+buildFromSource typeLibrary source =
29+ do modul@(Module _ _ _ decls') <- Parse.program source
2630
2731 -- check for structural errors
2832 Module names exs ims decls <-
29− case Check.mistakes decls of
33+ case Check.mistakes decls' of
3034 [] -> return modul
3135 ms -> Left ms
3236
@@ -60,7 +64,7 @@ sortDeps :: [Deps] -> IO [String]
6064sortDeps depends =
6165 if null mistakes
6266 then return (concat sccs)
63− else print (msg ++ show mistakes) >> exitFailure
67+ else print msg >> mapM print mistakes >> exitFailure
6468 where
6569 graph = map (\(name, deps) -> (toFilePath name, name, deps)) depends
6670 sccs = map Graph.flattenSCC $ Graph.stronglyConnComp graph