diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2015-10-29 17:41:34 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-10-29 17:42:26 +0100 |
| commit | bbaf76f949426c91d6abbbc5eced1f705530087b (patch) | |
| tree | 3c25529a062e94493d874349d55f71cfaa3e6dea /ghc | |
| parent | bef2f03e4d56d88a7e9752a7afd6a0a35616da6c (diff) | |
| download | haskell-bbaf76f949426c91d6abbbc5eced1f705530087b.tar.gz | |
Revert "Generate Typeable info at definition sites"
This reverts commit bef2f03e4d56d88a7e9752a7afd6a0a35616da6c.
This merge was botched
Also reverts haddock submodule.
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/InteractiveUI.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 1153afa414..736b8a957e 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -1342,7 +1342,7 @@ defineMacro overwrite s = do step <- getGhciStepIO expr <- GHC.parseExpr definition -- > ghciStepIO . definition :: String -> IO String - let stringTy = nlHsTyVar stringTy_RDR + let stringTy = nlHsTyVar $ getRdrName stringTyConName ioM = nlHsTyVar (getRdrName ioTyConName) `nlHsAppTy` stringTy body = nlHsVar compose_RDR `mkHsApp` step `mkHsApp` expr tySig = stringTy `nlHsFunTy` ioM @@ -1392,7 +1392,7 @@ cmdCmd str = handleSourceError GHC.printException $ do getGhciStepIO :: GHCi (LHsExpr RdrName) getGhciStepIO = do ghciTyConName <- GHC.getGHCiMonad - let stringTy = nlHsTyVar stringTy_RDR + let stringTy = nlHsTyVar $ getRdrName stringTyConName ghciM = nlHsTyVar (getRdrName ghciTyConName) `nlHsAppTy` stringTy ioM = nlHsTyVar (getRdrName ioTyConName) `nlHsAppTy` stringTy body = nlHsVar (getRdrName ghciStepIoMName) |