diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2014-03-16 18:35:28 +0100 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2014-03-16 18:46:16 +0100 |
| commit | d59170b6deaee480640889e8a7eef5a863242562 (patch) | |
| tree | 52ff222f04a2c9e14682b1abf4db4984fea72fb9 | |
| parent | db497cd1bef818e5b2ae3028a48538f2cba95157 (diff) | |
| download | haskell-d59170b6deaee480640889e8a7eef5a863242562.tar.gz | |
Coercible is now exported from GHC.Types (#8894)
so do not export it in GHC.Prim, and also have the pseudo-code for
GHC.Prim import GHC.Types, so that haddock is happy.
| -rw-r--r-- | compiler/prelude/PrelInfo.lhs | 4 | ||||
| -rw-r--r-- | compiler/prelude/primops.txt.pp | 2 | ||||
| -rw-r--r-- | utils/genprimopcode/Main.hs | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/compiler/prelude/PrelInfo.lhs b/compiler/prelude/PrelInfo.lhs index ca156ee694..014e0e7483 100644 --- a/compiler/prelude/PrelInfo.lhs +++ b/compiler/prelude/PrelInfo.lhs @@ -124,15 +124,13 @@ primOpId op = primOpIds ! primOpTag op GHC.Prim "exports" all the primops and primitive types, some wired-in Ids. -See Note [Kind-changing of (~) and Coerciblea] for why we export coercibleTyCon here. - \begin{code} ghcPrimExports :: [IfaceExport] ghcPrimExports = map (Avail . idName) ghcPrimIds ++ map (Avail . idName . primOpId) allThePrimOps ++ [ AvailTC n [n] - | tc <- funTyCon : coercibleTyCon : primTyCons, let n = tyConName tc ] + | tc <- funTyCon : primTyCons, let n = tyConName tc ] \end{code} diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp index 63aef0fbb6..49fef3523a 100644 --- a/compiler/prelude/primops.txt.pp +++ b/compiler/prelude/primops.txt.pp @@ -2380,8 +2380,6 @@ pseudoop "coerce" concrete types. } -primclass Coercible a b - ------------------------------------------------------------------------ section "SIMD Vectors" {Operations on SIMD vectors.} diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs index d60081f6d3..05d42faaef 100644 --- a/utils/genprimopcode/Main.hs +++ b/utils/genprimopcode/Main.hs @@ -252,6 +252,7 @@ gen_hs_source (Info defaults entries) = ++ "{-\n" ++ unlines (map opt defaults) ++ "-}\n" + ++ "import GHC.Types (Coercible)\n" ++ unlines (concatMap ent entries') ++ "\n\n\n" where entries' = concatMap desugarVectorSpec entries |