From 7ac362d85c8bc2d2817e2c464c2a201097d09214 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Thu, 22 Jan 1998 15:58:05 +0000
Subject: [PATCH] [project @ 1998-01-22 15:58:01 by sof] Changes to reflect
Error->GHCerr move
---
ghc/compiler/prelude/PrelInfo.lhs | 6 ++++--
ghc/compiler/prelude/PrelMods.lhs | 3 +--
ghc/compiler/prelude/PrelVals.lhs | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index 60673c3bd243..1edca06f2fea 100644
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -21,7 +21,8 @@ module PrelInfo (
ltH_Float_RDR, eqH_Double_RDR, ltH_Double_RDR, eqH_Int_RDR,
ltH_Int_RDR, geH_RDR, leH_RDR, minusH_RDR, false_RDR, true_RDR,
and_RDR, not_RDR, append_RDR, map_RDR, compose_RDR, mkInt_RDR,
- error_RDR, showString_RDR, showParen_RDR, readParen_RDR, lex_RDR,
+ error_RDR, assert_RDR,
+ showString_RDR, showParen_RDR, readParen_RDR, lex_RDR,
showSpace_RDR, showList___RDR, readList___RDR, negate_RDR,
numClass_RDR, fractionalClass_RDR, eqClass_RDR,
@@ -431,7 +432,8 @@ plus_RDR = varQual (pREL_BASE, SLIT("+"))
times_RDR = varQual (pREL_BASE, SLIT("*"))
mkInt_RDR = varQual (pREL_BASE, SLIT("I#"))
-error_RDR = varQual (eRROR, SLIT("error"))
+error_RDR = varQual (gHC_ERR, SLIT("error"))
+assert_RDR = varQual (gHC_ERR, SLIT("assert__"))
eqH_Char_RDR = prelude_primop CharEqOp
ltH_Char_RDR = prelude_primop CharLtOp
diff --git a/ghc/compiler/prelude/PrelMods.lhs b/ghc/compiler/prelude/PrelMods.lhs
index 1973663de9a9..287a37852ee1 100644
--- a/ghc/compiler/prelude/PrelMods.lhs
+++ b/ghc/compiler/prelude/PrelMods.lhs
@@ -15,7 +15,7 @@ module PrelMods
gHC__, pRELUDE, pREL_BASE,
pREL_READ , pREL_NUM, pREL_LIST,
pREL_TUP , pACKED_STRING, cONC_BASE,
- iO_BASE , eRROR, mONAD, rATIO, iX,
+ iO_BASE , mONAD, rATIO, iX,
sT_BASE , aRR_BASE, fOREIGN, mAIN,
gHC_MAIN , gHC_ERR,
cCALL , aDDR
@@ -42,7 +42,6 @@ pREL_TUP = SLIT("PrelTup")
pACKED_STRING= SLIT("PackBase")
cONC_BASE = SLIT("ConcBase")
iO_BASE = SLIT("IOBase")
-eRROR = SLIT("Error")
mONAD = SLIT("Monad")
rATIO = SLIT("Ratio")
iX = SLIT("Ix")
diff --git a/ghc/compiler/prelude/PrelVals.lhs b/ghc/compiler/prelude/PrelVals.lhs
index 99e4c2b05030..c3885b6b1839 100644
--- a/ghc/compiler/prelude/PrelVals.lhs
+++ b/ghc/compiler/prelude/PrelVals.lhs
@@ -80,7 +80,7 @@ pc_bottoming_Id key mod name ty
-- these "bottom" out, no matter what their arguments
eRROR_ID
- = pc_bottoming_Id errorIdKey eRROR SLIT("error") errorTy
+ = pc_bottoming_Id errorIdKey gHC_ERR SLIT("error") errorTy
generic_ERROR_ID u n
= pc_bottoming_Id u gHC_ERR n errorTy
--
GitLab