From 1064a48b4cb5b883c14510c0ce7cae290da14453 Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Wed, 22 Aug 2007 16:09:53 +0000 Subject: [PATCH] PR is an explicit record, not a class --- compiler/prelude/PrelNames.lhs | 7 +++---- compiler/vectorise/VectMonad.hs | 9 ++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index b3194a1..8de554d 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, preprTyConName, prClassName +ndpNames = [ parrayTyConName, paTyConName, preprTyConName, prTyConName , ndpCrossTyConName, ndpPlusTyConName, embedTyConName , closureTyConName , mkClosureName, applyClosureName @@ -696,7 +696,7 @@ checkDotnetResName = varQual dOTNET FSLIT("checkResult") checkDotnetResNam parrayTyConName = tcQual nDP_PARRAY FSLIT("PArray") parrayTyConKey paTyConName = tcQual nDP_PARRAY FSLIT("PA") paTyConKey preprTyConName = tcQual nDP_PARRAY FSLIT("PRepr") preprTyConKey -prClassName = clsQual nDP_PARRAY FSLIT("PR") prClassKey +prTyConName = clsQual nDP_PARRAY FSLIT("PR") prTyConKey ndpCrossTyConName = tcQual nDP_PARRAY FSLIT(":*:") ndpCrossTyConKey ndpPlusTyConName = tcQual nDP_PARRAY FSLIT(":+:") ndpPlusTyConKey embedTyConName = tcQual nDP_PARRAY FSLIT("Embed") embedTyConKey @@ -780,8 +780,6 @@ randomClassKey = mkPreludeClassUnique 31 randomGenClassKey = mkPreludeClassUnique 32 isStringClassKey = mkPreludeClassUnique 33 - -prClassKey = mkPreludeClassUnique 34 \end{code} %************************************************************************ @@ -899,6 +897,7 @@ preprTyConKey = mkPreludeTyConUnique 138 embedTyConKey = mkPreludeTyConUnique 139 ndpCrossTyConKey = mkPreludeTyConUnique 140 ndpPlusTyConKey = mkPreludeTyConUnique 141 +prTyConKey = mkPreludeTyConUnique 142 ---------------- Template Haskell ------------------- diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index cd26ace..9fe6755 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -69,7 +69,8 @@ data Builtins = Builtins { , paTyCon :: TyCon , paDataCon :: DataCon , preprTyCon :: TyCon - , prClass :: Class + , prTyCon :: TyCon + , prDataCon :: DataCon , embedTyCon :: TyCon , embedDataCon :: DataCon , crossTyCon :: TyCon @@ -98,7 +99,8 @@ initBuiltins paTyCon <- dsLookupTyCon paTyConName let [paDataCon] = tyConDataCons paTyCon preprTyCon <- dsLookupTyCon preprTyConName - prClass <- dsLookupClass prClassName + prTyCon <- dsLookupTyCon prTyConName + let [prDataCon] = tyConDataCons prTyCon embedTyCon <- dsLookupTyCon embedTyConName let [embedDataCon] = tyConDataCons embedTyCon crossTyCon <- dsLookupTyCon ndpCrossTyConName @@ -126,7 +128,8 @@ initBuiltins , paTyCon = paTyCon , paDataCon = paDataCon , preprTyCon = preprTyCon - , prClass = prClass + , prTyCon = prTyCon + , prDataCon = prDataCon , embedTyCon = embedTyCon , embedDataCon = embedDataCon , crossTyCon = crossTyCon -- 1.7.10.4