git.iko.soy/elk
on master help sign in
SourceSyntax/ => AST/ in more modules
e08d95bEvan Czaplicki
compiler/Build/Interface.hs+1−1
compare with master
unifiedsplit
@@ -7,7 +7,7 @@ import qualified Data.Binary as Binary
7import qualified Build.Print as Print
7import qualified Build.Print as Print
8import qualified Elm.Internal.Version as Version
8import qualified Elm.Internal.Version as Version
9import System.Directory (doesFileExist)
9import System.Directory (doesFileExist)
10−import SourceSyntax.Module
10+import AST.Module
11
11
12load :: Binary.Binary a => FilePath -> IO a
12load :: Binary.Binary a => FilePath -> IO a
13load filePath =
13load filePath =
compiler/Build/Print.hs+2−2
@@ -5,8 +5,8 @@ import System.Exit (exitFailure)
5
5
6import qualified Data.Map as Map
6import qualified Data.Map as Map
7import qualified Data.List as List
7import qualified Data.List as List
8−import qualified SourceSyntax.Module as M
8+import qualified AST.Module as M
9−import qualified SourceSyntax.PrettyPrint as Pretty
9+import qualified AST.PrettyPrint as Pretty
10import qualified Type.Alias as Alias
10import qualified Type.Alias as Alias
11import qualified Text.PrettyPrint as P
11import qualified Text.PrettyPrint as P
12
12
compiler/Build/Source.hs+1−1
@@ -15,7 +15,7 @@ import qualified Metadata.Prelude as Prelude
15import qualified Transform.Check as Check
15import qualified Transform.Check as Check
16import qualified Transform.SortDefinitions as SD
16import qualified Transform.SortDefinitions as SD
17import qualified Type.Inference as TI
17import qualified Type.Inference as TI
18−import qualified Type.Constrain.Declaration as TcDecl
18+import qualified Transform.Declaration as TcDecl
19import qualified Transform.Canonicalize as Canonical
19import qualified Transform.Canonicalize as Canonical
20
20
21build :: Bool -> Interfaces -> String -> Either [Doc] MetadataModule
21build :: Bool -> Interfaces -> String -> Either [Doc] MetadataModule
compiler/Elm/Internal/Utils.hs+2−2
@@ -6,7 +6,7 @@ import qualified Data.List as List
6import qualified Generate.JavaScript as JS
6import qualified Generate.JavaScript as JS
7import qualified Build.Source as Source
7import qualified Build.Source as Source
8import qualified Parse.Module as Parser
8import qualified Parse.Module as Parser
9−import qualified SourceSyntax.Module as M
9+import qualified AST.Module as M
10import qualified Text.PrettyPrint as P
10import qualified Text.PrettyPrint as P
11import qualified Metadata.Prelude as Prelude
11import qualified Metadata.Prelude as Prelude
12import System.IO.Unsafe
12import System.IO.Unsafe
@@ -25,4 +25,4 @@ interfaces = unsafePerformIO $ Prelude.interfaces False
25
25
26-- |This function extracts the module name of a given source program.
26-- |This function extracts the module name of a given source program.
27moduleName :: String -> Maybe String
27moduleName :: String -> Maybe String
28−moduleName = Parser.getModuleName
28+moduleName = Parser.getModuleName
compiler/Metadata/Prelude.hs+4−3
@@ -5,12 +5,13 @@ 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 SourceSyntax.Module
8+import AST.Module
9import qualified Build.Interface as Interface
9import qualified Build.Interface as Interface
10import Build.Utils (getDataFile)
10import Build.Utils (getDataFile)
11
11
12−add :: Bool -> Module def -> Module def
12+add :: Bool -> Module exs body -> Module exs body
13−add noPrelude (Module name exs ims decls) = Module name exs (customIms ++ ims) decls
13+add noPrelude (Module name path exs ims decls) =
14+ Module name path exs (customIms ++ ims) decls
14 where
15 where
15 customIms = if noPrelude then [] else concatMap addModule prelude
16 customIms = if noPrelude then [] else concatMap addModule prelude
16
17
compiler/Type/Alias.hs+2−2
@@ -7,8 +7,8 @@ import Control.Arrow (second)
7import Data.Map ((!))
7import Data.Map ((!))
8import qualified Data.Map as Map
8import qualified Data.Map as Map
9import qualified Data.List as List
9import qualified Data.List as List
10−import SourceSyntax.Type
10+import AST.Type
11−import SourceSyntax.Module
11+import AST.Module
12
12
13type Rules = ([Alias], Type -> Type)
13type Rules = ([Alias], Type -> Type)
14
14