Commit 5eb542ca authored by batterseapower's avatar batterseapower
Browse files

Follow OccName changes in ParserCore

parent 27241cd4
...@@ -352,7 +352,7 @@ eqTc (IfaceTc name) tycon = name == tyConName tycon ...@@ -352,7 +352,7 @@ eqTc (IfaceTc name) tycon = name == tyConName tycon
-- are very limited (see the productions for 'ty', so the translation -- are very limited (see the productions for 'ty', so the translation
-- isn't hard -- isn't hard
toHsType :: IfaceType -> LHsType RdrName toHsType :: IfaceType -> LHsType RdrName
toHsType (IfaceTyVar v) = noLoc $ HsTyVar (mkRdrUnqual (mkTyVarOcc v)) toHsType (IfaceTyVar v) = noLoc $ HsTyVar (mkRdrUnqual (mkTyVarOccFS v))
toHsType (IfaceAppTy t1 t2) = noLoc $ HsAppTy (toHsType t1) (toHsType t2) toHsType (IfaceAppTy t1 t2) = noLoc $ HsAppTy (toHsType t1) (toHsType t2)
toHsType (IfaceFunTy t1 t2) = noLoc $ HsFunTy (toHsType t1) (toHsType t2) toHsType (IfaceFunTy t1 t2) = noLoc $ HsFunTy (toHsType t1) (toHsType t2)
toHsType (IfaceTyConApp (IfaceTc tc) ts) = foldl mkHsAppTy (noLoc $ HsTyVar (ifaceExtRdrName tc)) (map toHsType ts) toHsType (IfaceTyConApp (IfaceTc tc) ts) = foldl mkHsAppTy (noLoc $ HsTyVar (ifaceExtRdrName tc)) (map toHsType ts)
...@@ -384,7 +384,7 @@ ifaceArrow ifT1 ifT2 = IfaceFunTy ifT1 ifT2 ...@@ -384,7 +384,7 @@ ifaceArrow ifT1 ifT2 = IfaceFunTy ifT1 ifT2
ifaceEq ifT1 ifT2 = IfacePredTy (IfaceEqPred ifT1 ifT2) ifaceEq ifT1 ifT2 = IfacePredTy (IfaceEqPred ifT1 ifT2)
toHsTvBndr :: IfaceTvBndr -> LHsTyVarBndr RdrName toHsTvBndr :: IfaceTvBndr -> LHsTyVarBndr RdrName
toHsTvBndr (tv,k) = noLoc $ KindedTyVar (mkRdrUnqual (mkTyVarOcc tv)) (toKind k) toHsTvBndr (tv,k) = noLoc $ KindedTyVar (mkRdrUnqual (mkTyVarOccFS tv)) (toKind k)
ifaceExtRdrName :: Name -> RdrName ifaceExtRdrName :: Name -> RdrName
ifaceExtRdrName name = mkOrig (nameModule name) (nameOccName name) ifaceExtRdrName name = mkOrig (nameModule name) (nameOccName name)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment