From 07fd74a9679d6a2480f773573f631a1c55d2c74c Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Tue, 13 Apr 2010 16:56:19 +0200 Subject: [PATCH] s/normalise/normalize/ --- "c\316\273ash/CLasH/Utils/Core/CoreTools.hs" | 10 +++++----- "c\316\273ash/CLasH/Utils/HsTools.hs" | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git "a/c\316\273ash/CLasH/Utils/Core/CoreTools.hs" "b/c\316\273ash/CLasH/Utils/Core/CoreTools.hs" index ce42678..ab3654f 100644 --- "a/c\316\273ash/CLasH/Utils/Core/CoreTools.hs" +++ "b/c\316\273ash/CLasH/Utils/Core/CoreTools.hs" @@ -53,7 +53,7 @@ type Binding = (CoreSyn.CoreBndr, CoreSyn.CoreExpr) tfp_to_int :: Type.Type -> TypeSession Int tfp_to_int ty = do hscenv <- MonadState.get tsHscEnv - let norm_ty = normalise_tfp_int hscenv ty + let norm_ty = normalize_tfp_int hscenv ty case Type.splitTyConApp_maybe norm_ty of Just (tycon, args) -> do let name = Name.getOccString (TyCon.tyConName tycon) @@ -71,7 +71,7 @@ tfp_to_int' :: Type.Type -> TypeSession Int tfp_to_int' ty = do lens <- MonadState.get tsTfpInts hscenv <- MonadState.get tsHscEnv - let norm_ty = normalise_tfp_int hscenv ty + let norm_ty = normalize_tfp_int hscenv ty let existing_len = Map.lookup (OrdType norm_ty) lens case existing_len of Just len -> return len @@ -101,10 +101,10 @@ eval_tfp_int env ty = libdir = DynFlags.topDir dynflags dynflags = HscTypes.hsc_dflags env -normalise_tfp_int :: HscTypes.HscEnv -> Type.Type -> Type.Type -normalise_tfp_int env ty = +normalize_tfp_int :: HscTypes.HscEnv -> Type.Type -> Type.Type +normalize_tfp_int env ty = System.IO.Unsafe.unsafePerformIO $ - normaliseType env ty + normalizeType env ty -- | Get the width of a SizedWord type -- sized_word_len :: HscTypes.HscEnv -> Type.Type -> Int diff --git "a/c\316\273ash/CLasH/Utils/HsTools.hs" "b/c\316\273ash/CLasH/Utils/HsTools.hs" index c08bad7..22b1382 100644 --- "a/c\316\273ash/CLasH/Utils/HsTools.hs" +++ "b/c\316\273ash/CLasH/Utils/HsTools.hs" @@ -109,11 +109,11 @@ mkId rdr_name = do -- tcLookupId to find out. TcEnv.tcLookupId name -normaliseType :: +normalizeType :: HscTypes.HscEnv -> Type.Type -> IO Type.Type -normaliseType env ty = do +normalizeType env ty = do (err, nty) <- MonadUtils.liftIO $ -- Initialize the typechecker monad TcRnMonad.initTcPrintErrors env PrelNames.iNTERACTIVE $ do -- 2.30.2