@@ -5,7 +5,7 @@ import qualified Data.Map as Map
5import qualified Control.Exception as E
5import qualified Control.Exception as E
6import System.Exit
6import System.Exit
7import System.IO
7import System.IO
8−import AST.Module
8+import AST.Module as Module
9import qualified Build.Interface as Interface
9import qualified Build.Interface as Interface
10import Build.Utils (getDataFile)
10import Build.Utils (getDataFile)
@@ -21,10 +21,9 @@ add noPrelude (Module name path exs ims decls) =
21 Just _ -> []
21 Just _ -> []
23prelude :: [(String, ImportMethod)]
23prelude :: [(String, ImportMethod)]
24−prelude = string ++ text ++ map (\n -> (n, Hiding [])) modules
24+prelude = string : map (\n -> (n, Module.open)) modules
26− text = map ((,) "Text") [ As "Text", Hiding ["link", "color", "height"] ]
27− string = map ((,) "String") [ As "String", Importing ["show"] ]
26+ string = ("String", Module.importing ["show"])
28 modules = [ "Basics", "Signal", "List", "Maybe", "Time", "Color"
27 modules = [ "Basics", "Signal", "List", "Maybe", "Time", "Color"
29 , "Graphics.Element", "Graphics.Collage"
28 , "Graphics.Element", "Graphics.Collage"
30 , "Native.Ports", "Native.Json"
29 , "Native.Ports", "Native.Json"
@@ -50,7 +49,7 @@ safeReadDocs name =
50readDocs :: FilePath -> IO Interfaces
49readDocs :: FilePath -> IO Interfaces
51readDocs filePath = do
50readDocs filePath = do
52 interfaces <- Interface.load filePath
51 interfaces <- Interface.load filePath
53− case mapM (Interface.isValid filePath) (interfaces :: [(String, ModuleInterface)]) of
52+ case mapM (Interface.isValid filePath) (interfaces :: [(String, Module.Interface)]) of
54 Left err -> do
53 Left err -> do
55 hPutStrLn stderr err
54 hPutStrLn stderr err
56 exitFailure
55 exitFailure