git.iko.soy/elk
on master help sign in
Update Elm.Header to include default imports a better way
d284233Evan Czaplicki
src/Elm/Header.hs+7−26
compare with master
unifiedsplit
@@ -9,7 +9,6 @@ module Elm.Header
9import qualified Data.ByteString as B
9import qualified Data.ByteString as B
10
10
11import qualified AST.Source as Src
11import qualified AST.Source as Src
12−import qualified Elm.Compiler.Imports as Imports
13import qualified Elm.Compiler.Module as M
12import qualified Elm.Compiler.Module as M
14import qualified Elm.Name as N
13import qualified Elm.Name as N
15import qualified Elm.Package as Pkg
14import qualified Elm.Package as Pkg
@@ -31,45 +30,27 @@ data Tag = Normal | Effect | Port
31
30
32
31
33parse :: Pkg.Name -> B.ByteString -> Either Error.Error (Maybe (Tag, M.Raw), [M.Raw])
32parse :: Pkg.Name -> B.ByteString -> Either Error.Error (Maybe (Tag, M.Raw), [M.Raw])
34−parse pkg sourceCode =
33+parse pkgName sourceCode =
34+ let
35+ headerParser =
36+ Module.module_ pkgName (return ())
37+ in
35− case Parser.run chompHeader sourceCode of
38+ case Parser.run headerParser sourceCode of
36 Right (Src.Module header imports _) ->
39 Right (Src.Module header imports _) ->
37 Right
40 Right
38 ( fmap simplifyHeader header
41 ( fmap simplifyHeader header
39− , toDeps pkg imports
42+ , map getName imports
40 )
43 )
41
44
42 Left err ->
45 Left err ->
43 Left (Error.Syntax err)
46 Left (Error.Syntax err)
44
47
45
48
46−chompHeader :: Parser.Parser (Src.Module ())
47−chompHeader =
48− Module.module_ $ return ()
49−
50−
51−
52−-- TO DEPS
53−
54−
55−toDeps :: Pkg.Name -> [Src.Import] -> [N.Name]
56−toDeps pkg imports =
57− if pkg == Pkg.core
58− then map getName imports
59− else map getName imports ++ defaultImports
60−
61−
62getName :: Src.Import -> N.Name
49getName :: Src.Import -> N.Name
63getName (Src.Import (A.At _ name) _ _) =
50getName (Src.Import (A.At _ name) _ _) =
64 name
51 name
65
52
66
53
67−{-# NOINLINE defaultImports #-}
68−defaultImports :: [N.Name]
69−defaultImports =
70− map Imports._name Imports.defaults
71−
72−
73
54
74-- TO HEADER
55-- TO HEADER
75
56