Skip to content
This repository was archived by the owner on Nov 1, 2018. It is now read-only.

Commit d31bb8b

Browse files
atzedijkstraatzedijkstra
committed
uhc-util consistency
1 parent 873ee9c commit d31bb8b

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎EHC/src/ehc/Gam/ClassDefaultGam.chs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type ClassDefaultGam = Gam HsName ClassDefaultGamInfo
5353
-- | Lookup a matching default for a predicate
5454
clDfGamLookupDefault
5555
:: ( VarLookup gm
56-
, VarLookupCmb VarMp gm
56+
, LookupApply VarMp gm
5757
, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo
5858
)
5959
=> FIIn' gm -> Pred -> ClassDefaultGam

‎EHC/src/ehc/Ty/FitsIn.chs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fiAppSpineLookup fi n gappSpineGam = asGamLookup n $ feAppSpineGam $ fiEnv fi
140140
%%][17
141141
fiAppSpineLookup
142142
:: forall gm .
143-
( VarLookupCmb VarMp gm
143+
( LookupApply VarMp gm
144144
, VarLookup gm
145145
, VarLookupKey gm ~ TyVarId, VarLookupVal gm ~ VarMpInfo
146146
)
@@ -296,7 +296,7 @@ fitsIn
296296
)
297297
=> -}
298298
( VarLookup gm
299-
, VarLookupCmb VarMp gm
299+
, LookupApply VarMp gm
300300
, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo
301301
)
302302
=> FIOpts -> FIEnv -> UID -> gm -> Ty -> Ty
@@ -327,7 +327,7 @@ fitsInFI
327327
)
328328
=> -}
329329
( VarLookup gm
330-
, VarLookupCmb VarMp gm
330+
, LookupApply VarMp gm
331331
, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo
332332
)
333333
=> FIIn' gm -> Ty -> Ty
@@ -1635,7 +1635,7 @@ fitsInFold opts env uniq varmp tyl
16351635

16361636
%%[(9 hmtyinfer) export(fitPredIntoPred)
16371637
fitPredIntoPred
1638-
:: ( VarLookupCmb VarMp gm
1638+
:: ( LookupApply VarMp gm
16391639
, VarLookup gm
16401640
, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo
16411641
)

‎EHC/src/ehc/Ty/FitsInCommon2.chs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ For debug/trace:
3939
%%[[4
4040
ppTyWithFI :: FIIn -> Ty -> PP_Doc
4141
%%][8
42-
ppTyWithFI :: (VarLookupCmb VarMp gm, VarUpdatable Ty gm, VarLookupKey gm ~ VarId) => FIIn' gm -> Ty -> PP_Doc
42+
ppTyWithFI :: (LookupApply VarMp gm, VarUpdatable Ty gm, VarLookupKey gm ~ VarId) => FIIn' gm -> Ty -> PP_Doc
4343
%%]]
4444
ppTyWithFI fi t = ppTyS (fiVarMpLoc fi |+> fiVarMp fi) t
4545

4646
%%[[4
4747
ppTyWithFIFO :: FIIn -> FIOut -> Ty -> PP_Doc
4848
%%][8
49-
ppTyWithFIFO :: (VarLookupCmb VarMp gm, VarUpdatable Ty gm, VarLookupKey gm ~ VarId) => FIIn' gm -> FIOut -> Ty -> PP_Doc
49+
ppTyWithFIFO :: (LookupApply VarMp gm, VarUpdatable Ty gm, VarLookupKey gm ~ VarId) => FIIn' gm -> FIOut -> Ty -> PP_Doc
5050
%%]]
5151
ppTyWithFIFO fi fo t = ppTyS (foVarMp fo |+> fiVarMp fi) t
5252
%%]

‎EHC/src/ehc/Ty/Trf/BetaReduce.chs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ betaRedTyLookAhead renv lkup ty
126126
%%[(11 hmtyinfer)
127127
-- | one expansion step of type level beta reduction
128128
tyBetaRed1
129-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
129+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
130130
=> TyBetaRedEnv gm -> TyBetaRedLkup gm -> Either Ty TyBetaRedLookAheadExpansion
131131
-> Maybe TyBetaRedOut
132132
tyBetaRed1 renv lkup tyOrFunAndArgs
@@ -178,7 +178,7 @@ tyBetaRed1 renv lkup tyOrFunAndArgs
178178

179179
%%[(11 hmtyinfer) export(tyBetaRed,tyBetaRedAndInit)
180180
tyBetaRed'
181-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
181+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
182182
=> TyBetaRedEnv gm -> TyBetaRedLkup gm -> Either Ty TyBetaRedLookAheadExpansion
183183
-> [TyBetaRedOut]
184184
tyBetaRed' renv lkup tyOrFunArgs
@@ -187,13 +187,13 @@ tyBetaRed' renv lkup tyOrFunArgs
187187
_ -> []
188188

189189
tyBetaRed
190-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
190+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
191191
=> TyBetaRedEnv gm -> TyBetaRedLkup gm -> Ty
192192
-> [TyBetaRedOut]
193193
tyBetaRed renv lkup ty = tyBetaRed' renv lkup (Left ty)
194194

195195
tyBetaRedAndInit
196-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
196+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
197197
=> TyBetaRedEnv gm -> TyBetaRedLkup gm -> Ty
198198
-> [TyBetaRedOut]
199199
tyBetaRedAndInit renv lkup ty
@@ -208,7 +208,7 @@ Additional substitutions found are assumed to be non-contradictory, so threading
208208

209209
%%[(11 hmtyinfer) export(tyBetaRedFullMb)
210210
tyBetaRedFullMb
211-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
211+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
212212
=> TyBetaRedEnv gm -> TyBetaRedLkup gm -> (Ty -> Maybe TyBetaRedOut) -> Ty
213213
-> Maybe TyBetaRedOut
214214
tyBetaRedFullMb renv lkup redSub ty
@@ -231,7 +231,7 @@ Just expand, recursively, without intermediate external expanding.
231231

232232
%%[(11 hmtyinfer) export(tyBetaRedFull)
233233
tyBetaRedFull
234-
:: (VarLookup gm, VarLookupKey gm ~ TyVarId, VarLookupVal gm ~ VarMpInfo, VarLookupCmb VarMp gm)
234+
:: (VarLookup gm, VarLookupKey gm ~ TyVarId, VarLookupVal gm ~ VarMpInfo, LookupApply VarMp gm)
235235
=> TyBetaRedEnv gm -> VarMp -> Ty
236236
-> Ty
237237
tyBetaRedFull renv varmp ty

‎EHC/src/ehc/Ty/Trf/Canonic.cag

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ predCanonic' opts pr
169169

170170
%%[(9 hmtyinfer) hs export(tyCanonic)
171171
tyCanonic
172-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
172+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
173173
=> TyBetaRedEnv gm -> Ty
174174
-> Ty
175175
tyCanonic fi
@@ -182,7 +182,7 @@ tyCanonic fi
182182

183183
%%[(9 hmtyinfer) hs export(tyCanonicFFI')
184184
tyCanonicFFI'
185-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
185+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
186186
=> Bool -- expand newtypes
187187
-> TyBetaRedEnv gm
188188
-> Ty
@@ -210,7 +210,7 @@ tyCanonicFFI' expNewtype renv
210210

211211
%%[(9 hmtyinfer) hs export(tyCanonicFFI)
212212
tyCanonicFFI
213-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
213+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
214214
=> TyBetaRedEnv gm
215215
-> Ty
216216
-> Ty
@@ -219,7 +219,7 @@ tyCanonicFFI = tyCanonicFFI' False
219219

220220
%%[(9 hmtyinfer) hs export(predCanonic)
221221
predCanonic
222-
:: (VarLookup gm, VarLookupCmb VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
222+
:: (VarLookup gm, LookupApply VarMp gm, VarLookupKey gm ~ VarId, VarLookupVal gm ~ VarMpInfo)
223223
=> TyBetaRedEnv gm -> Pred
224224
-> (Pred,VarMp)
225225
predCanonic renv

0 commit comments

Comments
 (0)