@@ -9,17 +9,12 @@ import SourceSyntax.Everything
99import Data.List (intercalate,partition)
1010import Parse.Parser (parseProgram, parseDependencies)
1111import qualified Metadata.Libraries as Libs
12−import Transform.Optimize
12+import qualified Transform.Optimize as Optimize
1313import qualified Transform.Check as Check
1414import System.Exit
1515import System.FilePath
1616
1717
18−{-- TODO: replace with new stuff
19−import Types.Hints (hints)
20−import Types.Unify (unify)
21−import Types.Alias (dealias, mistakes)
22−--}
2318unify = undefined
2419hints = undefined
2520
@@ -27,13 +22,13 @@ hints = undefined
2722checkMistakes :: (Data t, Data v) => Module t v -> Either String (Module t v)
2823checkMistakes modul@(Module name ex im decls) =
2924 case Check.mistakes decls of
30− m:ms -> Left (unlines (m:ms))
31− [] -> return modul
25+ [] -> return modul
26+ ms -> Left (unlines ms)
3227
3328checkTypes :: (Data t, Data v) => Module t v -> Either String (Module t v)
3429checkTypes modul =
3530 do subs <- unify hints modul
36− subs `seq` return (optimize (renameModule modul))
31+ subs `seq` return (Optimize.optimize (renameModule modul))
3732
3833check :: (Data t, Data v) => Module t v -> Either String (Module t v)
3934check = checkMistakes >=> checkTypes
@@ -41,7 +36,7 @@ check = checkMistakes >=> checkTypes
4136buildFromSource :: (Data t, Data v) => Bool -> String -> Either String (Module t v)
4237buildFromSource noPrelude src =
4338 let add = if noPrelude then id else Libs.addPrelude in
44− (check . add) =<< (parseProgram src)
39+ (check . add) =<< parseProgram src
4540
4641getSortedModuleNames :: FilePath -> IO [String]
4742getSortedModuleNames root =