git.iko.soy/elk
on master help sign in
Do not require a Pkg.Name for parseDependencies
5a82332Evan Czaplicki
src/Elm/Compiler.hs+6−6
compare with master
unifiedsplit
@@ -55,18 +55,18 @@ data Tag
55 | Port
55 | Port
56
56
57
57
58−parseDependencies :: Package.Name -> Text -> Either Error (Tag, PublicModule.Raw, [PublicModule.Raw])
58+parseDependencies :: Maybe Package.Name -> Text -> Either Error (Tag, PublicModule.Raw, [PublicModule.Raw])
59−parseDependencies pkgName sourceCode =
59+parseDependencies maybePkgName sourceCode =
60 case Parse.run Parse.header sourceCode of
60 case Parse.run Parse.header sourceCode of
61 Right header ->
61 Right header ->
62− Right $ getDeps pkgName header
62+ Right $ getDeps maybePkgName header
63
63
64 Left err ->
64 Left err ->
65 Left (Error (A.map Error.Syntax err))
65 Left (Error (A.map Error.Syntax err))
66
66
67
67
68−getDeps :: Package.Name -> Module.Header [Module.UserImport] -> (Tag, PublicModule.Raw, [PublicModule.Raw])
68+getDeps :: Maybe Package.Name -> Module.Header [Module.UserImport] -> (Tag, PublicModule.Raw, [PublicModule.Raw])
69−getDeps pkgName (Module.Header sourceTag name _ _ _ imports) =
69+getDeps maybePkgName (Module.Header sourceTag name _ _ _ imports) =
70 let
70 let
71 tag =
71 tag =
72 case sourceTag of
72 case sourceTag of
@@ -75,7 +75,7 @@ getDeps pkgName (Module.Header sourceTag name _ _ _ imports) =
75 Module.Effect _ -> Effect
75 Module.Effect _ -> Effect
76
76
77 deps =
77 deps =
78− if pkgName == Package.core then
78+ if maybePkgName == Just Package.core then
79 map (fst . A.drop) imports
79 map (fst . A.drop) imports
80 else
80 else
81 map (fst . A.drop) imports ++ map fst Imports.defaults
81 map (fst . A.drop) imports ++ map fst Imports.defaults