git.iko.soy/elk
on master help sign in
Add default imports a bit differently / update data structures
c0d4e35Evan Czaplicki
compiler/src/Elm/Compiler/Imports.hs+7−11
compare with master
unifiedsplit
@@ -10,20 +10,16 @@ import qualified Data.Name as Name
10
10
11import qualified AST.Source as Src
11import qualified AST.Source as Src
12import qualified Elm.ModuleName as ModuleName
12import qualified Elm.ModuleName as ModuleName
13−import qualified Elm.Package as Pkg
14import qualified Reporting.Annotation as A
13import qualified Reporting.Annotation as A
15−import qualified Reporting.Region as R
16
14
17
15
18
16
19-- ADD DEFAULTS
17-- ADD DEFAULTS
20
18
21
19
22−addDefaults :: Pkg.Name -> [Src.Import] -> [Src.Import]
20+addDefaults :: [Src.Import] -> [Src.Import]
23−addDefaults pkgName imports =
21+addDefaults imports =
24− if pkgName == Pkg.core
25− then imports
26− else defaults ++ imports
22+ defaults ++ imports
27
23
28
24
29
25
@@ -48,7 +44,7 @@ defaults =
48
44
49import_ :: ModuleName.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import
45import_ :: ModuleName.Canonical -> Maybe Name.Name -> Src.Exposing -> Src.Import
50import_ (ModuleName.Canonical _ name) maybeAlias exposing =
46import_ (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
52
48
53
49
54
50
@@ -62,14 +58,14 @@ closed =
62
58
63typeOpen :: Name.Name -> Src.Exposing
59typeOpen :: Name.Name -> Src.Exposing
64typeOpen name =
60typeOpen 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) ]
66
62
67
63
68typeClosed :: Name.Name -> Src.Exposing
64typeClosed :: Name.Name -> Src.Exposing
69typeClosed name =
65typeClosed 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) ]
71
67
72
68
73operator :: Name.Name -> Src.Exposing
69operator :: Name.Name -> Src.Exposing
74operator op =
70operator op =
75− Src.Explicit [ A.At R.zero (Src.Operator op) ]
71+ Src.Explicit [ A.At A.zero (Src.Operator op) ]