X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FPrimOp.lhs;h=a65035228096c09f8408f3a2c8fe8fa8a688547b;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=6dc4ec1a8df861700fe3971a38ce1ed47fe3a70f;hpb=74e0bdb67ea643c0586e40893bdafcbe651267ba;p=ghc-hetmet.git

diff --git a/ghc/compiler/prelude/PrimOp.lhs b/ghc/compiler/prelude/PrimOp.lhs
index 6dc4ec1..a650352 100644
--- a/ghc/compiler/prelude/PrimOp.lhs
+++ b/ghc/compiler/prelude/PrimOp.lhs
@@ -17,15 +17,15 @@ module PrimOp (
 
 #include "HsVersions.h"
 
-import PrimRep		-- most of it
 import TysPrim
 import TysWiredIn
 
 import NewDemand
 import Var		( TyVar )
-import OccName		( OccName, pprOccName, mkVarOcc )
-import TyCon		( TyCon, isPrimTyCon, tyConPrimRep )
-import Type		( Type, mkForAllTys, mkFunTy, mkFunTys, typePrimRep, tyConAppTyCon )
+import OccName		( OccName, pprOccName, mkVarOccFS )
+import TyCon		( TyCon, isPrimTyCon, tyConPrimRep, PrimRep(..) )
+import Type		( Type, mkForAllTys, mkFunTy, mkFunTys, tyConAppTyCon,
+			  typePrimRep )
 import BasicTypes	( Arity, Boxity(..) )
 import Outputable
 import FastTypes
@@ -55,7 +55,6 @@ primOpTag op = iBox (tagOf_PrimOp op)
 -- supplies   
 -- tagOf_PrimOp :: PrimOp -> FastInt
 #include "primop-tag.hs-incl"
-tagOf_PrimOp op = pprPanic# "tagOf_PrimOp: pattern-match" (ppr op)
 
 
 instance Eq PrimOp where
@@ -114,10 +113,10 @@ data PrimOpInfo
 		[Type] 
 		Type 
 
-mkDyadic str  ty = Dyadic  (mkVarOcc str) ty
-mkMonadic str ty = Monadic (mkVarOcc str) ty
-mkCompare str ty = Compare (mkVarOcc str) ty
-mkGenPrimOp str tvs tys ty = GenPrimOp (mkVarOcc str) tvs tys ty
+mkDyadic str  ty = Dyadic  (mkVarOccFS str) ty
+mkMonadic str ty = Monadic (mkVarOccFS str) ty
+mkCompare str ty = Compare (mkVarOccFS str) ty
+mkGenPrimOp str tvs tys ty = GenPrimOp (mkVarOccFS str) tvs tys ty
 \end{code}
 
 %************************************************************************