diff options
author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2020-02-29 18:29:17 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-03-02 01:18:33 -0500 |
commit | 3cf7303bf39bca734bd87f0f42872f1a4025fa34 (patch) | |
tree | bc6f7c176e53396b61314191a969b3f0f70c2de0 | |
parent | 3979485bd97771373214c44d14b7830ba447ad23 (diff) | |
download | haskell-3cf7303bf39bca734bd87f0f42872f1a4025fa34.tar.gz |
Remove dead code
* The names in PrelName and THNames are no longer used
since TH merged types and kinds, Typeable is kind-polymorphic,
.net support was removed
* unqualQuasiQuote no longer used since 6f8ff0bbad3b9fa3
-rw-r--r-- | compiler/GHC/Hs/Utils.hs | 7 | ||||
-rw-r--r-- | compiler/prelude/PrelNames.hs | 30 | ||||
-rw-r--r-- | compiler/prelude/THNames.hs | 19 |
3 files changed, 4 insertions, 52 deletions
diff --git a/compiler/GHC/Hs/Utils.hs b/compiler/GHC/Hs/Utils.hs index 3864164263..ac157d4caf 100644 --- a/compiler/GHC/Hs/Utils.hs +++ b/compiler/GHC/Hs/Utils.hs @@ -77,7 +77,7 @@ module GHC.Hs.Utils( -- * Template Haskell mkUntypedSplice, mkTypedSplice, - mkHsQuasiQuote, unqualQuasiQuote, + mkHsQuasiQuote, -- * Collecting binders isUnliftedHsBind, isBangedHsBind, @@ -367,11 +367,6 @@ mkHsQuasiQuote :: RdrName -> SrcSpan -> FastString -> HsSplice GhcPs mkHsQuasiQuote quoter span quote = HsQuasiQuote noExtField unqualSplice quoter span quote -unqualQuasiQuote :: RdrName -unqualQuasiQuote = mkRdrUnqual (mkVarOccFS (fsLit "quasiquote")) - -- A name (uniquified later) to - -- identify the quasi-quote - mkHsString :: String -> HsLit (GhcPass p) mkHsString s = HsString NoSourceText (mkFastString s) diff --git a/compiler/prelude/PrelNames.hs b/compiler/prelude/PrelNames.hs index 531742ea50..e0d957c00a 100644 --- a/compiler/prelude/PrelNames.hs +++ b/compiler/prelude/PrelNames.hs @@ -803,9 +803,6 @@ showSpace_RDR = varQual_RDR gHC_SHOW (fsLit "showSpace") showCommaSpace_RDR = varQual_RDR gHC_SHOW (fsLit "showCommaSpace") showParen_RDR = varQual_RDR gHC_SHOW (fsLit "showParen") -undefined_RDR :: RdrName -undefined_RDR = varQual_RDR gHC_ERR (fsLit "undefined") - error_RDR :: RdrName error_RDR = varQual_RDR gHC_ERR (fsLit "error") @@ -1592,17 +1589,8 @@ realFracClassKey = mkPreludeClassUnique 16 showClassKey = mkPreludeClassUnique 17 ixClassKey = mkPreludeClassUnique 18 -typeableClassKey, typeable1ClassKey, typeable2ClassKey, typeable3ClassKey, - typeable4ClassKey, typeable5ClassKey, typeable6ClassKey, typeable7ClassKey - :: Unique +typeableClassKey :: Unique typeableClassKey = mkPreludeClassUnique 20 -typeable1ClassKey = mkPreludeClassUnique 21 -typeable2ClassKey = mkPreludeClassUnique 22 -typeable3ClassKey = mkPreludeClassUnique 23 -typeable4ClassKey = mkPreludeClassUnique 24 -typeable5ClassKey = mkPreludeClassUnique 25 -typeable6ClassKey = mkPreludeClassUnique 26 -typeable7ClassKey = mkPreludeClassUnique 27 monadFixClassKey :: Unique monadFixClassKey = mkPreludeClassUnique 28 @@ -1768,10 +1756,6 @@ funPtrTyConKey = mkPreludeTyConUnique 78 tVarPrimTyConKey = mkPreludeTyConUnique 79 compactPrimTyConKey = mkPreludeTyConUnique 80 --- dotnet interop -objectTyConKey :: Unique -objectTyConKey = mkPreludeTyConUnique 83 - eitherTyConKey :: Unique eitherTyConKey = mkPreludeTyConUnique 84 @@ -2246,18 +2230,6 @@ rationalToFloatIdKey, rationalToDoubleIdKey :: Unique rationalToFloatIdKey = mkPreludeMiscIdUnique 130 rationalToDoubleIdKey = mkPreludeMiscIdUnique 131 --- dotnet interop -unmarshalObjectIdKey, marshalObjectIdKey, marshalStringIdKey, - unmarshalStringIdKey, checkDotnetResNameIdKey :: Unique -unmarshalObjectIdKey = mkPreludeMiscIdUnique 150 -marshalObjectIdKey = mkPreludeMiscIdUnique 151 -marshalStringIdKey = mkPreludeMiscIdUnique 152 -unmarshalStringIdKey = mkPreludeMiscIdUnique 153 -checkDotnetResNameIdKey = mkPreludeMiscIdUnique 154 - -undefinedKey :: Unique -undefinedKey = mkPreludeMiscIdUnique 155 - magicDictKey :: Unique magicDictKey = mkPreludeMiscIdUnique 156 diff --git a/compiler/prelude/THNames.hs b/compiler/prelude/THNames.hs index 4b38dbc39a..7e131aa1ca 100644 --- a/compiler/prelude/THNames.hs +++ b/compiler/prelude/THNames.hs @@ -108,7 +108,6 @@ templateHaskellNames = [ -- Role nominalRName, representationalRName, phantomRName, inferRName, -- Kind - varKName, conKName, tupleKName, arrowKName, listKName, appKName, starKName, constraintKName, -- FamilyResultSig noSigName, kindSigName, tyVarSigName, @@ -480,14 +479,7 @@ phantomRName = libFun (fsLit "phantomR") phantomRIdKey inferRName = libFun (fsLit "inferR") inferRIdKey -- data Kind = ... -varKName, conKName, tupleKName, arrowKName, listKName, appKName, - starKName, constraintKName :: Name -varKName = libFun (fsLit "varK") varKIdKey -conKName = libFun (fsLit "conK") conKIdKey -tupleKName = libFun (fsLit "tupleK") tupleKIdKey -arrowKName = libFun (fsLit "arrowK") arrowKIdKey -listKName = libFun (fsLit "listK") listKIdKey -appKName = libFun (fsLit "appK") appKIdKey +starKName, constraintKName :: Name starKName = libFun (fsLit "starK") starKIdKey constraintKName = libFun (fsLit "constraintK") constraintKIdKey @@ -1001,14 +993,7 @@ phantomRIdKey = mkPreludeMiscIdUnique 417 inferRIdKey = mkPreludeMiscIdUnique 418 -- data Kind = ... -varKIdKey, conKIdKey, tupleKIdKey, arrowKIdKey, listKIdKey, appKIdKey, - starKIdKey, constraintKIdKey :: Unique -varKIdKey = mkPreludeMiscIdUnique 419 -conKIdKey = mkPreludeMiscIdUnique 420 -tupleKIdKey = mkPreludeMiscIdUnique 421 -arrowKIdKey = mkPreludeMiscIdUnique 422 -listKIdKey = mkPreludeMiscIdUnique 423 -appKIdKey = mkPreludeMiscIdUnique 424 +starKIdKey, constraintKIdKey :: Unique starKIdKey = mkPreludeMiscIdUnique 425 constraintKIdKey = mkPreludeMiscIdUnique 426 |