From 537ad72afb7dc3f163c6f77c61dfa7656f58386b Mon Sep 17 00:00:00 2001 From: yihuang Date: Sat, 4 Feb 2012 20:04:40 +0800 Subject: [PATCH] fix name collision. --- Control/Monad/Unpack/TH.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Control/Monad/Unpack/TH.hs b/Control/Monad/Unpack/TH.hs index 40428ba..05d1278 100644 --- a/Control/Monad/Unpack/TH.hs +++ b/Control/Monad/Unpack/TH.hs @@ -73,7 +73,7 @@ unpacker1 cxt tyCon tyArgs con = case conArgs con of u <- getUnique funcName <- newName $ "UnpackedReaderTCon" ++ show u mName <- newName "m" - aName <- newName "a" + aName <- newName "z" fName <- newName "func" let decs = [NewtypeInstD [] ''UnpackedReaderT [theTy, VarT mName, VarT aName] @@ -101,7 +101,7 @@ unpacker cxt tyCon tyArgs con = case conArgs con of u <- getUnique funcName <- newName $ "UnpackedReaderT" ++ show u mName <- newName "m" - aName <- newName "a" + aName <- newName "z" fName <- newName "func" let monadStack = foldr (\ argTy stk -> ConT ''UnpackedReaderT `AppT` argTy `AppT` stk) (VarT mName) conArgs @@ -134,7 +134,7 @@ noUnpacker cxt tyCon tyArgs = do u <- getUnique funcName <- newName $ "UnpackedReaderT" ++ show u mName <- newName "m" - aName <- newName "a" + aName <- newName "z" fName <- newName "func" let decs = [NewtypeInstD [] ''UnpackedReaderT [theTy, VarT mName, VarT aName] @@ -144,4 +144,4 @@ noUnpacker cxt tyCon tyArgs = do (NormalB (VarE fName `AppE` VarE argName)) []], FunD 'unpackedReaderT [Clause [VarP fName] (NormalB $ ConE funcName `AppE` VarE fName) []]] - return [InstanceD cxt (ConT ''Unpackable `AppT` theTy) decs] \ No newline at end of file + return [InstanceD cxt (ConT ''Unpackable `AppT` theTy) decs]