diff options
| author | Nicolas Frisby <nicolas.frisby@gmail.com> | 2013-08-22 15:00:41 -0500 |
|---|---|---|
| committer | Nicolas Frisby <nicolas.frisby@gmail.com> | 2013-08-22 15:00:54 -0500 |
| commit | 84f9927c1a04b8e35b97101771d8f6d625643d9b (patch) | |
| tree | 050d7265a24fa1ff9aecc4081bb01bc444520587 /utils/genprimopcode | |
| parent | 2eaf46fb1bb8c661c03f3e5e80622207ef2509d9 (diff) | |
| parent | c24be4b761df558d9edc9c0b1554bb558c261b14 (diff) | |
| download | haskell-late-dmd.tar.gz | |
merged master into late-dmdlate-dmd
Diffstat (limited to 'utils/genprimopcode')
| -rw-r--r-- | utils/genprimopcode/Main.hs | 3 | ||||
| -rw-r--r-- | utils/genprimopcode/Syntax.hs | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs index 4230cd8696..8729d4c73c 100644 --- a/utils/genprimopcode/Main.hs +++ b/utils/genprimopcode/Main.hs @@ -138,8 +138,6 @@ gen_hs_source (Info defaults entries) = ++ unlines (map (("\t" ++) . hdr) entries) ++ ") where\n" ++ "\n" - ++ "import GHC.Types\n" - ++ "\n" ++ "{-\n" ++ unlines (map opt defaults) ++ "-}\n" @@ -507,7 +505,6 @@ gen_wrappers (Info _ entries) -- don't need the Prelude here so we add NoImplicitPrelude. ++ "module GHC.PrimopWrappers where\n" ++ "import qualified GHC.Prim\n" - ++ "import GHC.Types (Bool)\n" ++ "import GHC.Tuple ()\n" ++ "import GHC.Prim (" ++ concat (intersperse ", " othertycons) ++ ")\n" ++ "#if defined (__GLASGOW_HASKELL_LLVM__)\n" diff --git a/utils/genprimopcode/Syntax.hs b/utils/genprimopcode/Syntax.hs index b2e983d48c..9d13f91e96 100644 --- a/utils/genprimopcode/Syntax.hs +++ b/utils/genprimopcode/Syntax.hs @@ -114,7 +114,7 @@ sanityPrimOp def_names p sane_ty :: Category -> Ty -> Bool sane_ty Compare (TyF t1 (TyF t2 td)) - | t1 == t2 && td == TyApp "Bool" [] = True + | t1 == t2 && td == TyApp "Int#" [] = True sane_ty Monadic (TyF t1 td) | t1 == td = True sane_ty Dyadic (TyF t1 (TyF t2 td)) |