on master help sign in
Add default imports a bit differently / update data structures
commitc0d4e357c9c538f6b6b18c6b3466fe713b8c1ed3 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 27 Dec 2018, 12:03 (8 years ago) parentaa7ade3
1 file changed+7−11
compiler/src/Elm/Compiler/Imports.hs+7−11
compiler/src/Elm/Compiler/Imports.hs+7−11
@@ -10,20 +10,16 @@ import qualified Data.Name as Name
1010
1111import qualified AST.Source as Src
1212import qualified Elm.ModuleName as ModuleName
13−import qualified Elm.Package as Pkg
1413import qualified Reporting.Annotation as A
15−import qualified Reporting.Region as R
1614
1715
1816
1917-- ADD DEFAULTS
2018
2119
22−addDefaults :: Pkg.Name -> [Src.Import] -> [Src.Import]
23−addDefaults pkgName imports =
24− if pkgName == Pkg.core
25− then imports
26− else defaults ++ imports
20+addDefaults :: [Src.Import] -> [Src.Import]
21+addDefaults imports =
22+ defaults ++ imports
2723
2824
2925
@@ -48,7 +44,7 @@ defaults =
4844
4945import_ :: ModuleName.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import
5046import_ (ModuleName.Canonical _ name) maybeAlias exposing =
51− Src.Import (A.At R.zero name) maybeAlias exposing
47+ Src.Import (A.At A.zero name) maybeAlias exposing
5248
5349
5450
@@ -62,14 +58,14 @@ closed =
6258
6359typeOpen :: Name.Name -> Src.Exposing
6460typeOpen name =
65− Src.Explicit [ A.At R.zero (Src.Upper name Src.Public) ]
61+ Src.Explicit [ A.At A.zero (Src.Upper name Src.Public) ]
6662
6763
6864typeClosed :: Name.Name -> Src.Exposing
6965typeClosed name =
70− Src.Explicit [ A.At R.zero (Src.Upper name Src.Private) ]
66+ Src.Explicit [ A.At A.zero (Src.Upper name Src.Private) ]
7167
7268
7369operator :: Name.Name -> Src.Exposing
7470operator op =
75− Src.Explicit [ A.At R.zero (Src.Operator op) ]
71+ Src.Explicit [ A.At A.zero (Src.Operator op) ]