minor cosmetics edits to Ty_TBind

Author: atzedijkstra

EHC/src/ehc/Ty.cag

@@ -1108,11 +1108,7 @@ tyMbVar = fmap fst . tyMbVar'
 tyMbQu :: Ty -> Maybe TyQu
 tyMbQu t
   = case tyUnAnn t of
-%%[[4
-      Ty_TBind q _ _
-%%][6
-      Ty_TBind q _ _ _
-%%]]
+      Ty_TBind {qu_Ty_TBind=q}
         -> Just q
       _ -> Nothing
 %%]
@@ -1160,8 +1156,8 @@ tyAllConS t
 tyQuant :: Ty -> Ty
 tyQuant t
   =  case tyUnAnn t of
-       Ty_TBind _ _ _ t'  -> tyQuant t'
-       _                  -> t
+       Ty_TBind {ty_Ty_TBind=t'} -> tyQuant t'
+       _                         -> t
 %%]
 
 Substitution aware variants
@@ -1226,8 +1222,8 @@ mkTyRecExt recd al
 tyVarChkVisitLift :: LookupTy -> (Ty -> x) -> (Ty -> x) -> Ty -> x
 tyVarChkVisitLift
   = withLkupChkVisitLift tyMbVar (noVisit . tyUnAnn)
-  where noVisit (Ty_TBind _ qv _ _) = Set.singleton qv
-        noVisit _                   = Set.empty
+  where noVisit (Ty_TBind {tv_Ty_TBind=qv}) = Set.singleton qv
+        noVisit _                           = Set.empty
 
 tyVarLift :: LookupTy -> (Ty -> x) -> (Ty -> x) -> Ty -> x
 tyVarLift = withLkupLift tyMbVar

EHC/src/ehc/Ty/FitsIn.chs

@@ -1189,33 +1189,21 @@ GADT: when encountering a product with eq-constraints on the outset, remove them
 %%]
 
 %%[(4 hmtyinfer).fitsIn.QLR
-%%[[4
-            fBase fi updTy t1@(Ty_TBind q1 _ _)   t2@(Ty_TBind q2 _ _)
-%%][6
-            fBase fi updTy t1@(Ty_TBind q1 _ _ _) t2@(Ty_TBind q2 _ _ _)
-%%]]
+            fBase fi updTy t1@(Ty_TBind {qu_Ty_TBind=q1})   t2@(Ty_TBind {qu_Ty_TBind=q2})
                 | fioMode (fiFIOpts fi) == FitUnify && q1 == q2
                                                     = fVar' fTySyn fi2 id uqt1 uqt2
                 where  (fi1,uqt1,_,_) = unquant fi   t1 False instCoConst
                        (fi2,uqt2,_,_) = unquant fi1  t2 False instCoConst
 %%]
 
 %%[(4 hmtyinfer).fitsIn.QR
-%%[[4
-            fBase fi updTy t1                     t2@(Ty_TBind _ _ _)
-%%][6
-            fBase fi updTy t1                     t2@(Ty_TBind _ _ _ _)
-%%]]
+            fBase fi updTy t1                     t2@(Ty_TBind {})
                 | fioIsSubsume (fiFIOpts fi) && fioLeaveRInst (fiFIOpts fi)
                                                     = back2 (fo { foRInstToL = instto2 ++ foRInstToL fo
                                                                 })
                 where (fi2,uqt2,back2,instto2) = unquant fi t2 False instCoConst
                       fo = fVar' fTySyn fi2 id t1 uqt2
-%%[[4
-            fBase fi updTy t1                     t2@(Ty_TBind _ _ _)
-%%][6
-            fBase fi updTy t1                     t2@(Ty_TBind _ _ _ _)
-%%]]
+            fBase fi updTy t1                     t2@(Ty_TBind {})
                 | fioIsSubsume (fiFIOpts fi) && not (fioLeaveRInst (fiFIOpts fi))
                                                     = back2 (fo { foRInstToL = instto2 ++ foRInstToL fo
                                                                 })
@@ -1224,11 +1212,7 @@ GADT: when encountering a product with eq-constraints on the outset, remove them
 %%]
 
 %%[(4 hmtyinfer).fitsIn.QL
-%%[[4
-            fBase fi updTy t1@(Ty_TBind _ _ _)    t2
-%%][6
-            fBase fi updTy t1@(Ty_TBind _ _ _ _)  t2
-%%]]
+            fBase fi updTy t1@(Ty_TBind {})    t2
                 | fioIsSubsume (fiFIOpts fi)        = fo { foLInstToL = instto1 ++ foLInstToL fo
                                                          }
                 where (fi1,uqt1,back1,instto1) = unquant fi t1 False instCoConst