git.iko.soy/elk
on master help sign in
Track package names in private interfaces
e9cd1f6Evan Czaplicki
compiler/src/Elm/Interface.hs+13−10
compare with master
unifiedsplit
@@ -11,11 +11,13 @@ module Elm.Interface
11 , public
11 , public
12 , private
12 , private
13 , privatize
13 , privatize
14+ , extractUnion
15+ , extractAlias
14 )
16 )
15 where
17 where
16
18
17
19
18−import Control.Monad (liftM, liftM2, liftM4, liftM5)
20+import Control.Monad (liftM, liftM3, liftM4, liftM5)
19import Data.Binary
21import Data.Binary
20import Data.Map.Strict ((!))
22import Data.Map.Strict ((!))
21import qualified Data.Map.Strict as Map
23import qualified Data.Map.Strict as Map
@@ -153,7 +155,10 @@ toPublicAlias iAlias =
153
155
154data DependencyInterface
156data DependencyInterface
155 = Public Interface
157 = Public Interface
158+ | Private
159+ Pkg.Name
156− | Private (Map.Map Name.Name Can.Union) (Map.Map Name.Name Can.Alias)
160+ (Map.Map Name.Name Can.Union)
161+ (Map.Map Name.Name Can.Alias)
157
162
158
163
159public :: Interface -> DependencyInterface
164public :: Interface -> DependencyInterface
@@ -162,10 +167,8 @@ public =
162
167
163
168
164private :: Interface -> DependencyInterface
169private :: Interface -> DependencyInterface
165−private (Interface _ _ unions aliases _) =
170+private (Interface pkg _ unions aliases _) =
166− Private
167− (Map.map extractUnion unions)
168− (Map.map extractAlias aliases)
171+ Private pkg (Map.map extractUnion unions) (Map.map extractAlias aliases)
169
172
170
173
171extractUnion :: Union -> Can.Union
174extractUnion :: Union -> Can.Union
@@ -187,7 +190,7 @@ privatize :: DependencyInterface -> DependencyInterface
187privatize di =
190privatize di =
188 case di of
191 case di of
189 Public i -> private i
192 Public i -> private i
190− Private _ _ -> di
193+ Private _ _ _ -> di
191
194
192
195
193
196
@@ -240,12 +243,12 @@ instance Binary Binop where
240instance Binary DependencyInterface where
243instance Binary DependencyInterface where
241 put union =
244 put union =
242 case union of
245 case union of
243− Public a -> putWord8 0 >> put a
246+ Public a -> putWord8 0 >> put a
244− Private a b -> putWord8 1 >> put a >> put b
247+ Private a b c -> putWord8 1 >> put a >> put b >> put c
245
248
246 get =
249 get =
247 do n <- getWord8
250 do n <- getWord8
248 case n of
251 case n of
249 0 -> liftM Public get
252 0 -> liftM Public get
250− 1 -> liftM2 Private get get
253+ 1 -> liftM3 Private get get get
251 _ -> error "binary encoding of DependencyInterface was corrupted"
254 _ -> error "binary encoding of DependencyInterface was corrupted"