From c2a7c5f51870dfaf7324e09dc22f1b3244717b47 Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Wed, 22 Aug 2007 04:46:34 +0000 Subject: [PATCH] Use NDP's own (:*:) and (:+:) --- compiler/prelude/PrelNames.lhs | 7 ++++++- compiler/vectorise/VectMonad.hs | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index b4d1925..60aff55 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -217,7 +217,8 @@ genericTyConNames :: [Name] genericTyConNames = [crossTyConName, plusTyConName, genUnitTyConName] ndpNames :: [Name] -ndpNames = [ parrayTyConName, paTyConName, preprTyConName, embedTyConName +ndpNames = [ parrayTyConName, paTyConName, preprTyConName + , ndpCrossTyConName, ndpPlusTyConName, embedTyConName , closureTyConName , mkClosureName, applyClosureName , mkClosurePName, applyClosurePName @@ -695,6 +696,8 @@ 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 +ndpCrossTyConName = tcQual nDP_PARRAY FSLIT(":*:") ndpCrossTyConKey +ndpPlusTyConName = tcQual nDP_PARRAY FSLIT(":+:") ndpPlusTyConKey embedTyConName = tcQual nDP_PARRAY FSLIT("Embed") embedTyConKey lengthPAName = varQual nDP_PARRAY FSLIT("lengthPA") lengthPAIdKey replicatePAName = varQual nDP_PARRAY FSLIT("replicatePA") replicatePAIdKey @@ -891,6 +894,8 @@ closureTyConKey = mkPreludeTyConUnique 136 paTyConKey = mkPreludeTyConUnique 137 preprTyConKey = mkPreludeTyConUnique 138 embedTyConKey = mkPreludeTyConUnique 139 +ndpCrossTyConKey = mkPreludeTyConUnique 140 +ndpPlusTyConKey = mkPreludeTyConUnique 141 ---------------- Template Haskell ------------------- diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index 22b776e..d407b38 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -98,9 +98,9 @@ initBuiltins preprTyCon <- dsLookupTyCon preprTyConName embedTyCon <- dsLookupTyCon embedTyConName let [embedDataCon] = tyConDataCons embedTyCon - crossTyCon <- dsLookupTyCon crossTyConName + crossTyCon <- dsLookupTyCon ndpCrossTyConName let [crossDataCon] = tyConDataCons crossTyCon - plusTyCon <- dsLookupTyCon plusTyConName + plusTyCon <- dsLookupTyCon ndpPlusTyConName let [leftDataCon, rightDataCon] = tyConDataCons plusTyCon closureTyCon <- dsLookupTyCon closureTyConName -- 1.7.10.4