b001556 · elk · git.iko.soy

git.iko.soy/elk

Don't unwrap Package.Name

commitb001556aa7cf932c6eb7715f6a76879bb9d646fe authorjmite <jmitdase@gmail.com> dateThu 27 Aug 2015, 11:12 (11 years ago) parentd4ac2bd

2 files changed+8−8

compare with master

unifiedsplit

src/Compile.hs+4−4 src/Elm/Compiler.hs+4−4

src/Compile.hs+4−4

@@ -5,6 +5,7 @@ import qualified Data.Map as Map

55import qualified AST.Module as Module

66import qualified Canonicalize

77import Elm.Utils ((|>))

8+import qualified Elm.Package as Package

89import qualified Nitpick.PatternMatches as Nitpick

910import qualified Nitpick.TopLevelTypes as Nitpick

1011import qualified Parse.Helpers as Parse

@@ -16,19 +17,18 @@ import qualified Type.Inference as TI

1617

1718

1819compile

19− :: String

20− -> String

20+ :: Package.Name

2121 -> Bool

2222 -> Module.Interfaces

2323 -> String

2424 -> Result.Result Warning.Warning Error.Error Module.CanonicalModule

2525

26−compile user projectName isRoot interfaces source =

26+compile packageName isRoot interfaces source =

2727 do

2828 -- determine if default imports should be added

2929 -- only elm-lang/core is exempt

3030 let needsDefaults =

31− not (user == "elm-lang" && projectName == "core")

31+ not (packageName == Package.Name "elm-lang" "core")

3232

3333 -- Parse the source code

3434 validModule <-

src/Elm/Compiler.hs+4−4

@@ -17,6 +17,7 @@ import qualified Docs.Check as Docs

1717import qualified Elm.Compiler.Module as PublicModule

1818import qualified Elm.Compiler.Version as Version

1919import qualified Elm.Docs as Docs

20+import qualified Elm.Package as Package

2021import qualified Generate.JavaScript as JS

2122import qualified Optimize

2223import qualified Parse.Module as Parse

@@ -72,14 +73,14 @@ compile

7273

7374compile context source interfaces =

7475 let

75− (Context user packageName isRoot isExposed) =

76+ (Context packageName isRoot isExposed) =

7677 context

7778

7879 unwrappedInterfaces =

7980 Map.mapKeysMonotonic (\(PublicModule.Name name) -> name) interfaces

8081

8182 (Result.Result (dealiaser, warnings) rawResult) =

82− do modul <- Compile.compile user packageName isRoot unwrappedInterfaces source

83+ do modul <- Compile.compile packageName isRoot unwrappedInterfaces source

8384 docs <- docsGen isExposed modul

8485

8586 let interface = Module.toInterface modul

@@ -95,8 +96,7 @@ compile context source interfaces =

9596

9697

9798data Context = Context

98− { _user :: String

99− , _packageName :: String

99+ { _packageName :: Package.Name

100100 , _isRoot :: Bool

101101 , _isExposed :: Bool

102102 }