git.iko.soy/elk
on master help sign in
Use Data.Name in module names
270d8bdEvan Czaplicki
compiler/src/AST/Module/Name.hs+16−26
compare with master
unifiedsplit
@@ -8,7 +8,7 @@ module AST.Module.Name
8 , virtualDom, debug, bitwise
8 , virtualDom, debug, bitwise
9 , jsonDecode, jsonEncode
9 , jsonDecode, jsonEncode
10 , webgl, texture, vector2, vector3, vector4, matrix4
10 , webgl, texture, vector2, vector3, vector4, matrix4
11− , isKernel, getKernel, canonicalIsKernel
11+ , canonicalIsKernel
12 )
12 )
13 where
13 where
14
14
@@ -16,8 +16,8 @@ module AST.Module.Name
16import Prelude hiding (maybe)
16import Prelude hiding (maybe)
17import Control.Monad (liftM2)
17import Control.Monad (liftM2)
18import Data.Binary
18import Data.Binary
19+import qualified Data.Name as Name
19
20
20−import qualified Elm.Name as N
21import qualified Elm.Package as Pkg
21import qualified Elm.Package as Pkg
22
22
23
23
@@ -28,7 +28,7 @@ import qualified Elm.Package as Pkg
28data Canonical =
28data Canonical =
29 Canonical
29 Canonical
30 { _package :: !Pkg.Name
30 { _package :: !Pkg.Name
31− , _module :: !N.Name
31+ , _module :: !Name.Name
32 }
32 }
33 deriving (Ord)
33 deriving (Ord)
34
34
@@ -49,12 +49,12 @@ basics = Canonical Pkg.core "Basics"
49
49
50{-# NOINLINE char #-}
50{-# NOINLINE char #-}
51char :: Canonical
51char :: Canonical
52−char = Canonical Pkg.core N.char
52+char = Canonical Pkg.core Name.char
53
53
54
54
55{-# NOINLINE string #-}
55{-# NOINLINE string #-}
56string :: Canonical
56string :: Canonical
57−string = Canonical Pkg.core N.string
57+string = Canonical Pkg.core Name.string
58
58
59
59
60
60
@@ -63,32 +63,32 @@ string = Canonical Pkg.core N.string
63
63
64{-# NOINLINE maybe #-}
64{-# NOINLINE maybe #-}
65maybe :: Canonical
65maybe :: Canonical
66−maybe = Canonical Pkg.core N.maybe
66+maybe = Canonical Pkg.core Name.maybe
67
67
68
68
69{-# NOINLINE result #-}
69{-# NOINLINE result #-}
70result :: Canonical
70result :: Canonical
71−result = Canonical Pkg.core N.result
71+result = Canonical Pkg.core Name.result
72
72
73
73
74{-# NOINLINE list #-}
74{-# NOINLINE list #-}
75list :: Canonical
75list :: Canonical
76−list = Canonical Pkg.core N.list
76+list = Canonical Pkg.core Name.list
77
77
78
78
79{-# NOINLINE array #-}
79{-# NOINLINE array #-}
80array :: Canonical
80array :: Canonical
81−array = Canonical Pkg.core N.array
81+array = Canonical Pkg.core Name.array
82
82
83
83
84{-# NOINLINE dict #-}
84{-# NOINLINE dict #-}
85dict :: Canonical
85dict :: Canonical
86−dict = Canonical Pkg.core N.dict
86+dict = Canonical Pkg.core Name.dict
87
87
88
88
89{-# NOINLINE tuple #-}
89{-# NOINLINE tuple #-}
90tuple :: Canonical
90tuple :: Canonical
91−tuple = Canonical Pkg.core N.tuple
91+tuple = Canonical Pkg.core Name.tuple
92
92
93
93
94
94
@@ -97,7 +97,7 @@ tuple = Canonical Pkg.core N.tuple
97
97
98{-# NOINLINE platform #-}
98{-# NOINLINE platform #-}
99platform :: Canonical
99platform :: Canonical
100−platform = Canonical Pkg.core N.platform
100+platform = Canonical Pkg.core Name.platform
101
101
102
102
103{-# NOINLINE cmd #-}
103{-# NOINLINE cmd #-}
@@ -116,17 +116,17 @@ sub = Canonical Pkg.core "Platform.Sub"
116
116
117{-# NOINLINE virtualDom #-}
117{-# NOINLINE virtualDom #-}
118virtualDom :: Canonical
118virtualDom :: Canonical
119−virtualDom = Canonical Pkg.virtualDom N.virtualDom
119+virtualDom = Canonical Pkg.virtualDom Name.virtualDom
120
120
121
121
122{-# NOINLINE debug #-}
122{-# NOINLINE debug #-}
123debug :: Canonical
123debug :: Canonical
124−debug = Canonical Pkg.core N.debug
124+debug = Canonical Pkg.core Name.debug
125
125
126
126
127{-# NOINLINE bitwise #-}
127{-# NOINLINE bitwise #-}
128bitwise :: Canonical
128bitwise :: Canonical
129−bitwise = Canonical Pkg.core N.bitwise
129+bitwise = Canonical Pkg.core Name.bitwise
130
130
131
131
132
132
@@ -181,19 +181,9 @@ matrix4 = Canonical Pkg.linearAlgebra "Math.Matrix4"
181-- IS KERNEL
181-- IS KERNEL
182
182
183
183
184−isKernel :: N.Name -> Bool
185−isKernel name =
186− N.startsWith "Elm.Kernel." name
187−
188−
189−getKernel :: N.Name -> N.Name
190−getKernel name =
191− N.drop 11 name
192−
193−
194canonicalIsKernel :: Canonical -> Bool
184canonicalIsKernel :: Canonical -> Bool
195canonicalIsKernel (Canonical _ name) =
185canonicalIsKernel (Canonical _ name) =
196− isKernel name
186+ Name.isKernel name
197
187
198
188
199
189