[Git][ghc/ghc][wip/krzysztof-cleanups] Remove dead code
Krzysztof Gogolewski
gitlab at gitlab.haskell.org
Fri Jun 14 18:22:51 UTC 2019
Krzysztof Gogolewski pushed to branch wip/krzysztof-cleanups at Glasgow Haskell Compiler / GHC
Commits:
ed324985 by Krzysztof Gogolewski at 2019-06-14T18:22:42Z
Remove dead code
- - - - -
5 changed files:
- compiler/rename/RnSplice.hs
- compiler/simplCore/CoreMonad.hs
- compiler/typecheck/TcEvidence.hs
- compiler/typecheck/TcRnMonad.hs
- compiler/utils/MonadUtils.hs
Changes:
=====================================
compiler/rename/RnSplice.hs
=====================================
@@ -378,22 +378,19 @@ mkQuasiQuoteExpr flavour quoter q_span quote
rnSplice :: HsSplice GhcPs -> RnM (HsSplice GhcRn, FreeVars)
-- Not exported...used for all
rnSplice (HsTypedSplice x hasParen splice_name expr)
- = do { checkTH expr "Template Haskell typed splice"
- ; loc <- getSrcSpanM
+ = do { loc <- getSrcSpanM
; n' <- newLocalBndrRn (cL loc splice_name)
; (expr', fvs) <- rnLExpr expr
; return (HsTypedSplice x hasParen n' expr', fvs) }
rnSplice (HsUntypedSplice x hasParen splice_name expr)
- = do { checkTH expr "Template Haskell untyped splice"
- ; loc <- getSrcSpanM
+ = do { loc <- getSrcSpanM
; n' <- newLocalBndrRn (cL loc splice_name)
; (expr', fvs) <- rnLExpr expr
; return (HsUntypedSplice x hasParen n' expr', fvs) }
rnSplice (HsQuasiQuote x splice_name quoter q_loc quote)
- = do { checkTH quoter "Template Haskell quasi-quote"
- ; loc <- getSrcSpanM
+ = do { loc <- getSrcSpanM
; splice_name' <- newLocalBndrRn (cL loc splice_name)
-- Rename the quoter; akin to the HsVar case of rnExpr
=====================================
compiler/simplCore/CoreMonad.hs
=====================================
@@ -36,7 +36,6 @@ module CoreMonad (
-- ** Lifting into the monad
liftIO, liftIOWithCount,
- liftIO1, liftIO2, liftIO3, liftIO4,
-- ** Dealing with annotations
getAnnotations, getFirstAnnotations,
=====================================
compiler/typecheck/TcEvidence.hs
=====================================
@@ -8,7 +8,7 @@ module TcEvidence (
HsWrapper(..),
(<.>), mkWpTyApps, mkWpEvApps, mkWpEvVarApps, mkWpTyLams,
mkWpLams, mkWpLet, mkWpCastN, mkWpCastR, collectHsWrapBinders,
- mkWpFun, mkWpFuns, idHsWrapper, isIdHsWrapper, isErasableHsWrapper,
+ mkWpFun, idHsWrapper, isIdHsWrapper, isErasableHsWrapper,
pprHsWrapper,
-- Evidence bindings
@@ -293,21 +293,6 @@ mkWpFun (WpCast co1) WpHole _ t2 _ = WpCast (mkTcFunCo Representational (
mkWpFun (WpCast co1) (WpCast co2) _ _ _ = WpCast (mkTcFunCo Representational (mkTcSymCo co1) co2)
mkWpFun co1 co2 t1 _ d = WpFun co1 co2 t1 d
--- | @mkWpFuns [(ty1, wrap1), (ty2, wrap2)] ty_res wrap_res@,
--- where @wrap1 :: ty1 "->" ty1'@ and @wrap2 :: ty2 "->" ty2'@,
--- @wrap3 :: ty3 "->" ty3'@ and @ty_res@ is /either/ @ty3@ or @ty3'@,
--- gives a wrapper @(ty1' -> ty2' -> ty3) "->" (ty1 -> ty2 -> ty3')@.
--- Notice that the result wrapper goes the other way round to all
--- the others. This is a result of sub-typing contravariance.
--- The SDoc is a description of what you were doing when you called mkWpFuns.
-mkWpFuns :: [(TcType, HsWrapper)] -> TcType -> HsWrapper -> SDoc -> HsWrapper
-mkWpFuns args res_ty res_wrap doc = snd $ go args res_ty res_wrap
- where
- go [] res_ty res_wrap = (res_ty, res_wrap)
- go ((arg_ty, arg_wrap) : args) res_ty res_wrap
- = let (tail_ty, tail_wrap) = go args res_ty res_wrap in
- (arg_ty `mkVisFunTy` tail_ty, mkWpFun arg_wrap tail_wrap arg_ty tail_ty doc)
-
mkWpCastR :: TcCoercionR -> HsWrapper
mkWpCastR co
| isTcReflCo co = WpHole
=====================================
compiler/typecheck/TcRnMonad.hs
=====================================
@@ -75,7 +75,6 @@ module TcRnMonad(
askNoErrs, discardErrs, tryTcDiscardingErrs,
checkNoErrs, whenNoErrs,
ifErrsM, failIfErrsM,
- checkTH, failTH,
-- * Context management for the type checker
getErrCtxt, setErrCtxt, addErrCtxt, addErrCtxtM, addLandmarkErrCtxt,
@@ -1021,17 +1020,6 @@ failIfErrsM :: TcRn ()
-- Useful to avoid error cascades
failIfErrsM = ifErrsM failM (return ())
-checkTH :: a -> String -> TcRn ()
-checkTH _ _ = return () -- OK
-
-failTH :: Outputable a => a -> String -> TcRn x
-failTH e what -- Raise an error in a stage-1 compiler
- = failWithTc (vcat [ hang (char 'A' <+> text what
- <+> text "requires GHC with interpreter support:")
- 2 (ppr e)
- , text "Perhaps you are using a stage-1 compiler?" ])
-
-
{- *********************************************************************
* *
Context management for the type checker
=====================================
compiler/utils/MonadUtils.hs
=====================================
@@ -8,8 +8,6 @@ module MonadUtils
, MonadFix(..)
, MonadIO(..)
- , liftIO1, liftIO2, liftIO3, liftIO4
-
, zipWith3M, zipWith3M_, zipWith4M, zipWithAndUnzipM
, mapAndUnzipM, mapAndUnzip3M, mapAndUnzip4M, mapAndUnzip5M
, mapAccumLM
@@ -37,27 +35,6 @@ import Control.Monad.IO.Class
import Data.Foldable (sequenceA_)
import Data.List (unzip4, unzip5, zipWith4)
--------------------------------------------------------------------------------
--- Lift combinators
--- These are used throughout the compiler
--------------------------------------------------------------------------------
-
--- | Lift an 'IO' operation with 1 argument into another monad
-liftIO1 :: MonadIO m => (a -> IO b) -> a -> m b
-liftIO1 = (.) liftIO
-
--- | Lift an 'IO' operation with 2 arguments into another monad
-liftIO2 :: MonadIO m => (a -> b -> IO c) -> a -> b -> m c
-liftIO2 = ((.).(.)) liftIO
-
--- | Lift an 'IO' operation with 3 arguments into another monad
-liftIO3 :: MonadIO m => (a -> b -> c -> IO d) -> a -> b -> c -> m d
-liftIO3 = ((.).((.).(.))) liftIO
-
--- | Lift an 'IO' operation with 4 arguments into another monad
-liftIO4 :: MonadIO m => (a -> b -> c -> d -> IO e) -> a -> b -> c -> d -> m e
-liftIO4 = (((.).(.)).((.).(.))) liftIO
-
-------------------------------------------------------------------------------
-- Common functions
-- These are used throughout the compiler
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/ed3249855b56d89febb8adc803f4d08d2dbe6700
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/ed3249855b56d89febb8adc803f4d08d2dbe6700
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190614/069838f6/attachment-0001.html>
More information about the ghc-commits
mailing list