git.iko.soy/elk
on master help sign in
Simplify default import code. No more infix stuff.
55fd854Evan Czaplicki
src/Elm/Compiler/Imports.hs+34−42
compare with master
unifiedsplit
@@ -1,58 +1,50 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
3−module Elm.Compiler.Imports (defaults) where
3+module Elm.Compiler.Imports
4+ ( Import(..)
5+ , Exposing(..)
6+ , defaults
7+ )
8+ where
4
9
5−import Data.Text (Text)
6
10
7−import qualified AST.Exposing as E
11+import qualified Elm.Name as N
8−import qualified AST.Module as Module
9−import qualified Reporting.Annotation as A
10−import qualified Reporting.Region as R
11
12
12
13
13
14
14−-- DEFAULT IMPORTS
15+-- IMPORTS
15
16
16
17
17−(==>) :: a -> b -> (a,b)
18+data Import =
18−(==>) = (,)
19+ Import
20+ { _name :: N.Name
21+ , _alias :: Maybe N.Name
22+ , _exposing :: Exposing
23+ }
19
24
20
25
21−defaults :: [Module.DefaultImport]
26+data Exposing
22−defaults =
27+ = Open
23− [ "Basics" ==> Module.ImportMethod Nothing E.Open
28+ | Closed
24− , "Debug" ==> Module.ImportMethod Nothing E.closed
29+ | TypeOpen N.Name
25− , "List" ==> exposing [E.Lower "::"]
30+ | TypeClosed N.Name
26− , "Maybe" ==> exposing [E.Upper "Maybe" (Just E.Open)]
31+ | Operator N.Name
27− , "Result" ==> exposing [E.Upper "Result" (Just E.Open)]
28− , "String" ==> Module.ImportMethod Nothing E.closed
29− , "Tuple" ==> Module.ImportMethod Nothing E.closed
30− , "Platform" ==> exposing [closedType "Program"]
31− , "Platform.Cmd" ==> named "Cmd" [closedType "Cmd"]
32− , "Platform.Sub" ==> named "Sub" [closedType "Sub"]
33− ]
34−
35−
36−exposing :: [E.Entry] -> Module.ImportMethod
37−exposing entries =
38− Module.ImportMethod Nothing (explicit entries)
39−
40
32
41−closedType :: Text -> E.Entry
42−closedType name =
43− E.Upper name Nothing
44
33
45
34
46−named :: Text -> [E.Entry] -> Module.ImportMethod
35+-- DEFAULTS
47−named name entries =
48− Module.ImportMethod (Just name) (explicit entries)
49
36
50
37
51−explicit :: [E.Entry] -> E.Raw
38+defaults :: [Import]
52−explicit entries =
39+defaults =
53− E.Explicit (map (A.A nowhere) entries)
40+ [ Import "Basics" Nothing Open
54−
41+ , Import "Debug" Nothing Closed
55−
42+ , Import "List" Nothing (Operator "::")
56−nowhere :: R.Region
43+ , Import "Maybe" Nothing (TypeOpen "Maybe")
57−nowhere =
44+ , Import "Result" Nothing (TypeOpen "Result")
58− R.Region (R.Position 1 1) (R.Position 1 1)
45+ , Import "String" Nothing Closed
46+ , Import "Tuple" Nothing Closed
47+ , Import "Platform" Nothing (TypeClosed "Program")
48+ , Import "Platform.Cmd" (Just "Cmd") (TypeClosed "Cmd")
49+ , Import "Platform.Sub" (Just "Sub") (TypeClosed "Sub")
50+ ]