From 58eb6de8922742d301a6703b4a21504dd8d623a5 Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Wed, 22 Aug 2007 01:29:07 +0000 Subject: [PATCH] Rename vectorisation-related stuff --- compiler/prelude/PrelNames.lhs | 6 +++--- compiler/vectorise/VectMonad.hs | 6 +++--- compiler/vectorise/VectType.hs | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 2d2edb0..b4d1925 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -217,7 +217,7 @@ genericTyConNames :: [Name] genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName] ndpNames :: [Name] -ndpNames = [ parrayTyConName, paTyConName, reprTyConName, embedTyConName +ndpNames = [ parrayTyConName, paTyConName, preprTyConName, embedTyConName , closureTyConName , mkClosureName, applyClosureName , mkClosurePName, applyClosurePName @@ -694,7 +694,7 @@ checkDotnetResName = varQual dOTNET FSLIT("checkResult") checkDotnetResNam -- NDP stuff parrayTyConName = tcQual nDP_PARRAY FSLIT("PArray") parrayTyConKey paTyConName = tcQual nDP_PARRAY FSLIT("PA") paTyConKey -reprTyConName = tcQual nDP_PARRAY FSLIT("Repr") reprTyConKey +preprTyConName = tcQual nDP_PARRAY FSLIT("PRepr") preprTyConKey embedTyConName = tcQual nDP_PARRAY FSLIT("Embed") embedTyConKey lengthPAName = varQual nDP_PARRAY FSLIT("lengthPA") lengthPAIdKey replicatePAName = varQual nDP_PARRAY FSLIT("replicatePA") replicatePAIdKey @@ -889,7 +889,7 @@ stringTyConKey = mkPreludeTyConUnique 134 parrayTyConKey = mkPreludeTyConUnique 135 closureTyConKey = mkPreludeTyConUnique 136 paTyConKey = mkPreludeTyConUnique 137 -reprTyConKey = mkPreludeTyConUnique 138 +preprTyConKey = mkPreludeTyConUnique 138 embedTyConKey = mkPreludeTyConUnique 139 diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index e3d9853..aae76c9 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -67,7 +67,7 @@ data Builtins = Builtins { parrayTyCon :: TyCon , paTyCon :: TyCon , paDataCon :: DataCon - , reprTyCon :: TyCon + , preprTyCon :: TyCon , embedTyCon :: TyCon , embedDataCon :: DataCon , crossTyCon :: TyCon @@ -92,7 +92,7 @@ initBuiltins parrayTyCon <- dsLookupTyCon parrayTyConName paTyCon <- dsLookupTyCon paTyConName let paDataCon = case tyConDataCons paTyCon of [dc] -> dc - reprTyCon <- dsLookupTyCon reprTyConName + preprTyCon <- dsLookupTyCon preprTyConName embedTyCon <- dsLookupTyCon embedTyConName let embedDataCon = case tyConDataCons embedTyCon of [dc] -> dc crossTyCon <- dsLookupTyCon crossTyConName @@ -117,7 +117,7 @@ initBuiltins parrayTyCon = parrayTyCon , paTyCon = paTyCon , paDataCon = paDataCon - , reprTyCon = reprTyCon + , preprTyCon = preprTyCon , embedTyCon = embedTyCon , embedDataCon = embedDataCon , crossTyCon = crossTyCon diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index d035062..e28b66f 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.hs @@ -213,13 +213,13 @@ mkSumOfProdRepr tys buildPReprTyCon :: TyCon -> TyCon -> VM TyCon buildPReprTyCon orig_tc vect_tc = do - name <- cloneName mkPReprTyConOcc (tyConName orig_tc) - rhs_ty <- buildPReprRhsTy vect_tc - repr_tc <- builtin reprTyCon + name <- cloneName mkPReprTyConOcc (tyConName orig_tc) + rhs_ty <- buildPReprRhsTy vect_tc + prepr_tc <- builtin preprTyCon liftDs $ buildSynTyCon name tyvars (SynonymTyCon rhs_ty) - (Just $ mk_fam_inst repr_tc vect_tc) + (Just $ mk_fam_inst prepr_tc vect_tc) where tyvars = tyConTyVars vect_tc -- 1.7.10.4