From: simonmar <unknown>
Date: Wed, 6 Mar 2002 14:47:18 +0000 (+0000)
Subject: [project @ 2002-03-06 14:47:17 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~2299
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8e824b2976627ecee2ea16334bd8e9dadbfedd28;p=ghc-hetmet.git

[project @ 2002-03-06 14:47:17 by simonmar]
Include the fixity declaration for 'seq' in the GHC.Prim interface.
---

diff --git a/ghc/compiler/basicTypes/MkId.lhs b/ghc/compiler/basicTypes/MkId.lhs
index 11dcc39..610fe38 100644
--- a/ghc/compiler/basicTypes/MkId.lhs
+++ b/ghc/compiler/basicTypes/MkId.lhs
@@ -22,7 +22,7 @@ module MkId (
 
 	-- And some particular Ids; see below for why they are wired in
 	wiredInIds, ghcPrimIds,
-	unsafeCoerceId, realWorldPrimId, voidArgId, nullAddrId,
+	unsafeCoerceId, realWorldPrimId, voidArgId, nullAddrId, seqId,
 	eRROR_ID, eRROR_CSTRING_ID, rEC_SEL_ERROR_ID, pAT_ERROR_ID,
 	rEC_CON_ERROR_ID, rEC_UPD_ERROR_ID, iRREFUT_PAT_ERROR_ID,
 	nON_EXHAUSTIVE_GUARDS_ERROR_ID,	nO_METHOD_BINDING_ERROR_ID,
diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs
index 2eb8003..4c33362 100644
--- a/ghc/compiler/rename/RnMonad.lhs
+++ b/ghc/compiler/rename/RnMonad.lhs
@@ -35,7 +35,8 @@ import HscTypes		( AvailEnv, emptyAvailEnv, lookupType,
 			  PersistentCompilerState(..), GlobalRdrEnv, 
 			  LocalRdrEnv,
 			  HomeIfaceTable, PackageIfaceTable )
-import BasicTypes	( Version, defaultFixity )
+import BasicTypes	( Version, defaultFixity, 
+			  Fixity(..), FixityDirection(..) )
 import ErrUtils		( addShortErrLocLine, addShortWarnLocLine,
 			  Message, Messages, errorsFound, warningsFound,
 			  printErrorsAndWarnings
@@ -44,14 +45,16 @@ import RdrName		( RdrName, dummyRdrVarName, rdrNameModule, rdrNameOcc,
 			  RdrNameEnv, emptyRdrEnv, extendRdrEnv, 
 			  addListToRdrEnv, rdrEnvToList, rdrEnvElts
 			)
+import Id		( idName )
+import MkId		( seqId )
 import Name		( Name, OccName, NamedThing(..), 
-			  nameOccName,
+			  nameOccName, nameRdrName,
 			  decode, mkLocalName, mkKnownKeyGlobal
 			)
 import NameEnv		( NameEnv, lookupNameEnv, emptyNameEnv,
 			  extendNameEnvList )
 import Module		( Module, ModuleName, ModuleSet, emptyModuleSet,
-			  PackageName )
+			  PackageName, preludePackage )
 import PrelInfo		( ghcPrimExports, 
 			  cCallableClassDecl, cReturnableClassDecl, assertDecl )
 import PrelNames	( mkUnboundName, gHC_PRIM_Name )
@@ -238,7 +241,7 @@ data ParsedIface
 ghcPrimIface :: ParsedIface
 ghcPrimIface = ParsedIface {
       pi_mod	 = gHC_PRIM_Name,
-      pi_pkg     = FSLIT("base"),
+      pi_pkg     = preludePackage,
       pi_vers    = 1,
       pi_orphan  = False,
       pi_usages  = [],
@@ -246,7 +249,8 @@ ghcPrimIface = ParsedIface {
       pi_decls   = [(1,cCallableClassDecl), 
 		    (1,cReturnableClassDecl), 
 		    (1,assertDecl)],
-      pi_fixity  = [],
+      pi_fixity  = [(nameRdrName (idName seqId), Fixity 0 InfixR)],
+		-- seq is infixr 0
       pi_insts   = [],
       pi_rules   = (1,[]),
       pi_deprecs = Nothing