Skip to content

Commit

Permalink
fix name collision.
Browse files Browse the repository at this point in the history
  • Loading branch information
yihuang committed Feb 4, 2012
1 parent c0925b5 commit 537ad72
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Control/Monad/Unpack/TH.hs
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand All @@ -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]
return [InstanceD cxt (ConT ''Unpackable `AppT` theTy) decs]

0 comments on commit 537ad72

Please sign in to comment.