diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-24 14:48:49 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-24 14:48:49 +0000 |
| commit | 00ed85dad9ef70f200240790693dc436b479b38b (patch) | |
| tree | 3fcf57ad02f8886d8b6632e9f4df15fea52d16ad | |
| parent | a1a38a088957ec6bae652ae49c814cfbcf6f0251 (diff) | |
| download | haskell-00ed85dad9ef70f200240790693dc436b479b38b.tar.gz | |
() is now in ghc-prim:GHC.Unit
| -rw-r--r-- | compiler/prelude/PrelNames.lhs | 5 | ||||
| -rw-r--r-- | utils/genprimopcode/Main.hs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 27d253b37c..57de3b08df 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -231,7 +231,7 @@ genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName] pRELUDE :: Module pRELUDE = mkBaseModule_ pRELUDE_NAME -gHC_PRIM, gHC_BOOL, gHC_ORDERING, gHC_GENERICS, gHC_BASE, gHC_ENUM, +gHC_PRIM, gHC_BOOL, gHC_UNIT, gHC_ORDERING, gHC_GENERICS, gHC_BASE, gHC_ENUM, gHC_SHOW, gHC_READ, gHC_NUM, gHC_INTEGER, gHC_LIST, gHC_PARR, dATA_TUP, dATA_EITHER, dATA_STRING, gHC_PACK, gHC_CONC, gHC_IO_BASE, gHC_ST, gHC_ARR, gHC_STABLE, gHC_ADDR, gHC_PTR, gHC_ERR, gHC_REAL, @@ -239,6 +239,7 @@ gHC_PRIM, gHC_BOOL, gHC_ORDERING, gHC_GENERICS, gHC_BASE, gHC_ENUM, dOTNET, rEAD_PREC, lEX, gHC_INT, gHC_WORD, mONAD, mONAD_FIX, aRROW, gHC_DESUGAR, rANDOM, gHC_EXTS :: Module gHC_PRIM = mkPrimModule (fsLit "GHC.Prim") -- Primitive types and values +gHC_UNIT = mkPrimModule (fsLit "GHC.Unit") gHC_BOOL = mkPrimModule (fsLit "GHC.Bool") gHC_ORDERING = mkPrimModule (fsLit "GHC.Ordering") gHC_GENERICS = mkPrimModule (fsLit "GHC.Generics") @@ -324,7 +325,7 @@ mkMainModule_ m = mkModule mainPackageId m \begin{code} mkTupleModule :: Boxity -> Arity -> Module -mkTupleModule Boxed 0 = gHC_BASE +mkTupleModule Boxed 0 = gHC_UNIT mkTupleModule Boxed _ = dATA_TUP mkTupleModule Unboxed _ = gHC_PRIM \end{code} diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs index f36aa3132e..71b1e76598 100644 --- a/utils/genprimopcode/Main.hs +++ b/utils/genprimopcode/Main.hs @@ -470,6 +470,7 @@ gen_wrappers (Info _ entries) ++ "module GHC.PrimopWrappers where\n" ++ "import qualified GHC.Prim\n" ++ "import GHC.Bool (Bool)\n" + ++ "import GHC.Unit ()\n" ++ "import GHC.Prim (" ++ types ++ ")\n" ++ unlines (concatMap f specs) where |