git.iko.soy/elk
on master help sign in
Update some uses of UF for the shorter names
commitd3fa29017c1d66fda8e17045a23c0e1018d0d34b authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 17 Nov 2017, 13:59 (9 years ago) parent1be6293
2 files changed+9−9
compare with master
unifiedsplit
src/Type/Occurs.hs+1−1 src/Type/Type.hs+8−8
src/Type/Occurs.hs+1−1
@@ -28,7 +28,7 @@ occursHelp seen var foundCycle =
2828 return True
2929
3030 else
31− do (Descriptor content _ _ _) <- UF.descriptor var
31+ do (Descriptor content _ _ _) <- UF.get var
3232 case content of
3333 FlexVar _ ->
3434 return foundCycle
src/Type/Type.hs+8−8
@@ -311,16 +311,16 @@ toSrcType variable =
311311
312312variableToSrcType :: Variable -> StateT NameState IO Can.Type
313313variableToSrcType variable =
314− do descriptor <- liftIO $ UF.descriptor variable
314+ do descriptor <- liftIO $ UF.get variable
315315 let mark = _mark descriptor
316316 if mark == occursMark
317317 then
318318 return (Can.TVar "∞")
319319
320320 else
321− do liftIO $ UF.modifyDescriptor variable (\desc -> desc { _mark = occursMark })
321+ do liftIO $ UF.modify variable (\desc -> desc { _mark = occursMark })
322322 srcType <- contentToSrcType variable (_content descriptor)
323− liftIO $ UF.modifyDescriptor variable (\desc -> desc { _mark = mark })
323+ liftIO $ UF.modify variable (\desc -> desc { _mark = mark })
324324 return srcType
325325
326326
@@ -337,7 +337,7 @@ contentToSrcType variable content =
337337
338338 Nothing ->
339339 do name <- getFreshVarName
340− liftIO $ UF.modifyDescriptor variable (\desc -> desc { _content = FlexVar (Just name) })
340+ liftIO $ UF.modify variable (\desc -> desc { _content = FlexVar (Just name) })
341341 return (Can.TVar name)
342342
343343 FlexSuper super maybeName ->
@@ -347,7 +347,7 @@ contentToSrcType variable content =
347347
348348 Nothing ->
349349 do name <- getFreshSuperName super
350− liftIO $ UF.modifyDescriptor variable (\desc -> desc { _content = FlexSuper super (Just name) })
350+ liftIO $ UF.modify variable (\desc -> desc { _content = FlexSuper super (Just name) })
351351 return (Can.TVar name)
352352
353353 RigidVar name ->
@@ -503,11 +503,11 @@ getFreshSuperHelp name index taken =
503503
504504getVarNames :: Variable -> TakenNames -> IO TakenNames
505505getVarNames var takenNames =
506− do (Descriptor content rank mark copy) <- UF.descriptor var
506+ do (Descriptor content rank mark copy) <- UF.get var
507507 if mark == getVarNamesMark
508508 then return takenNames
509509 else
510− do UF.setDescriptor var (Descriptor content rank getVarNamesMark copy)
510+ do UF.set var (Descriptor content rank getVarNamesMark copy)
511511 case content of
512512 Error _ ->
513513 return takenNames
@@ -580,7 +580,7 @@ addName index givenName var makeContent takenNames =
580580 case Map.lookup indexedName takenNames of
581581 Nothing ->
582582 do if indexedName == givenName then return () else
583− UF.modifyDescriptor var $ \(Descriptor _ rank mark copy) ->
583+ UF.modify var $ \(Descriptor _ rank mark copy) ->
584584 Descriptor (makeContent indexedName) rank mark copy
585585 return $ Map.insert indexedName var takenNames
586586