@@ -63,9 +63,11 @@ getPortType portType =
6363
6464tuple :: R.Region -> [Raw] -> Raw
6565tuple region types =
66− let name = Var.Raw ("_Tuple" ++ show (length types))
66+ let
67+ name =
68+ Var.Raw ("_Tuple" ++ show (length types))
6769 in
68− A.A region (RApp (A.A region (RType name)) types)
70+ A.A region (RApp (A.A region (RType name)) types)
6971
7072
7173
@@ -76,65 +78,68 @@ deepDealias :: Canonical -> Canonical
7678deepDealias tipe =
7779 case tipe of
7880 Lambda a b ->
79− Lambda (deepDealias a) (deepDealias b)
81+ Lambda (deepDealias a) (deepDealias b)
8082
8183 Var _ ->
82− tipe
84+ tipe
8385
8486 Record fields ext ->
85− Record (map (second deepDealias) fields) (fmap deepDealias ext)
87+ Record (map (second deepDealias) fields) (fmap deepDealias ext)
8688
8789 Aliased _name args tipe' ->
88− deepDealias (dealias args tipe')
90+ deepDealias (dealias args tipe')
8991
9092 Type _ ->
91− tipe
93+ tipe
9294
9395 App f args ->
94− App (deepDealias f) (map deepDealias args)
96+ App (deepDealias f) (map deepDealias args)
9597
9698
9799iteratedDealias :: Canonical -> Canonical
98100iteratedDealias tipe =
99101 case tipe of
100102 Aliased _ args realType ->
101− iteratedDealias (dealias args realType)
103+ iteratedDealias (dealias args realType)
102104
103105 _ ->
104− tipe
106+ tipe
105107
106108
107109dealias :: [(String, Canonical)] -> Aliased Canonical -> Canonical
108110dealias args aliasType =
109111 case aliasType of
110112 Holey tipe ->
111− dealiasHelp (Map.fromList args) tipe
113+ dealiasHelp (Map.fromList args) tipe
112114
113115 Filled tipe ->
114− tipe
116+ tipe
115117
116118
117119dealiasHelp :: Map.Map String Canonical -> Canonical -> Canonical
118120dealiasHelp typeTable tipe =
119− let go = dealiasHelp typeTable in
120− case tipe of
121− Lambda a b ->
122− Lambda (go a) (go b)
121+ let
122+ go =
123+ dealiasHelp typeTable
124+ in
125+ case tipe of
126+ Lambda a b ->
127+ Lambda (go a) (go b)
123128
124− Var x ->
125− Map.findWithDefault tipe x typeTable
129+ Var x ->
130+ Map.findWithDefault tipe x typeTable
126131
127− Record fields ext ->
128− Record (map (second go) fields) (fmap go ext)
132+ Record fields ext ->
133+ Record (map (second go) fields) (fmap go ext)
129134
130− Aliased original args t' ->
131− Aliased original (map (second go) args) t'
135+ Aliased original args t' ->
136+ Aliased original (map (second go) args) t'
132137
133− Type _ ->
134− tipe
138+ Type _ ->
139+ tipe
135140
136− App f args ->
137− App (go f) (map go args)
141+ App f args ->
142+ App (go f) (map go args)
138143
139144
140145
@@ -145,10 +150,10 @@ collectLambdas :: Canonical -> [Canonical]
145150collectLambdas tipe =
146151 case tipe of
147152 Lambda arg result ->
148− arg : collectLambdas result
153+ arg : collectLambdas result
149154
150155 _ ->
151− [tipe]
156+ [tipe]
152157
153158
154159
@@ -157,49 +162,49 @@ collectLambdas tipe =
157162
158163instance Binary Canonical where
159164 put tipe =
160− case tipe of
161− Lambda t1 t2 ->
162− putWord8 0 >> put t1 >> put t2
165+ case tipe of
166+ Lambda t1 t2 ->
167+ putWord8 0 >> put t1 >> put t2
163168
164− Var x ->
165− putWord8 1 >> put x
169+ Var x ->
170+ putWord8 1 >> put x
166171
167− Type name ->
168− putWord8 2 >> put name
172+ Type name ->
173+ putWord8 2 >> put name
169174
170− App t1 t2 ->
171− putWord8 3 >> put t1 >> put t2
175+ App t1 t2 ->
176+ putWord8 3 >> put t1 >> put t2
172177
173− Record fs ext ->
174− putWord8 4 >> put fs >> put ext
178+ Record fs ext ->
179+ putWord8 4 >> put fs >> put ext
175180
176− Aliased var args t ->
177− putWord8 5 >> put var >> put args >> put t
181+ Aliased var args t ->
182+ putWord8 5 >> put var >> put args >> put t
178183
179− get = do
180− n <- getWord8
181− case n of
182− 0 -> Lambda <$> get <*> get
183− 1 -> Var <$> get
184− 2 -> Type <$> get
185− 3 -> App <$> get <*> get
186− 4 -> Record <$> get <*> get
187− 5 -> Aliased <$> get <*> get <*> get
188− _ -> error "Error reading a valid type from serialized string"
184+ get =
185+ do n <- getWord8
186+ case n of
187+ 0 -> Lambda <$> get <*> get
188+ 1 -> Var <$> get
189+ 2 -> Type <$> get
190+ 3 -> App <$> get <*> get
191+ 4 -> Record <$> get <*> get
192+ 5 -> Aliased <$> get <*> get <*> get
193+ _ -> error "Error reading a valid type from serialized string"
189194
190195
191196instance Binary t => Binary (Aliased t) where
192197 put aliasType =
193− case aliasType of
194− Holey tipe ->
195− putWord8 0 >> put tipe
196−
197− Filled tipe ->
198− putWord8 1 >> put tipe
199−
200− get = do
201− n <- getWord8
202− case n of
203− 0 -> Holey <$> get
204− 1 -> Filled <$> get
205− _ -> error "Error reading a valid type from serialized string"
198+ case aliasType of
199+ Holey tipe ->
200+ putWord8 0 >> put tipe
201+
202+ Filled tipe ->
203+ putWord8 1 >> put tipe
204+
205+ get =
206+ do n <- getWord8
207+ case n of
208+ 0 -> Holey <$> get
209+ 1 -> Filled <$> get
210+ _ -> error "Error reading a valid type from serialized string"