[project @ 1996-05-17 16:02:43 by partain]

[ghc-hetmet.git] / ghc / compiler / types / TyVar.lhs

diff --git a/ghc/compiler/types/TyVar.lhs b/ghc/compiler/types/TyVar.lhs
index 1b700f6..980f1dd 100644 (file)
--- a/ghc/compiler/types/TyVar.lhs
+++ b/ghc/compiler/types/TyVar.lhs
@@ -4,7 +4,7 @@
 module TyVar (
        GenTyVar(..), TyVar(..),
        mkTyVar,
-       getTyVarKind,           -- TyVar -> Kind
+       tyVarKind,              -- TyVar -> Kind
        cloneTyVar,
 
        alphaTyVars, alphaTyVar, betaTyVar, gammaTyVar, deltaTyVar,
@@ -35,7 +35,7 @@ import UniqFM         ( emptyUFM, listToUFM, addToUFM, lookupUFM,
                          plusUFM, sizeUFM, UniqFM
                        )
 import Maybes          ( Maybe(..) )
-import Name            ( mkLocalName, Name, RdrName(..) )
+import Name            ( mkLocalName, changeUnique, Name, RdrName(..) )
 import Pretty          ( Pretty(..), PrettyRep, ppBeside, ppPStr )
 import PprStyle                ( PprStyle )
 --import Outputable    ( Outputable(..), NamedThing(..), ExportFlag(..) )
@@ -63,11 +63,11 @@ Simple construction and analysis functions
 mkTyVar :: Name -> Unique -> Kind -> TyVar
 mkTyVar name uniq kind = TyVar  uniq
                                kind
-                               (Just name)
+                               (Just (changeUnique name uniq))
                                usageOmega
 
-getTyVarKind :: GenTyVar flexi -> Kind
-getTyVarKind (TyVar _ kind _ _) = kind
+tyVarKind :: GenTyVar flexi -> Kind
+tyVarKind (TyVar _ kind _ _) = kind
 
 cloneTyVar :: GenTyVar flexi -> Unique -> GenTyVar flexi
 cloneTyVar (TyVar _ k n x) u = TyVar u k n x
@@ -147,6 +147,6 @@ instance Uniquable (GenTyVar a) where
     uniqueOf (TyVar u _ _ _) = u
 
 instance NamedThing (GenTyVar a) where
-    getName            (TyVar _ _ (Just n) _) = n
-    getName            (TyVar u _ _        _) = mkLocalName u (showUnique u) mkUnknownSrcLoc
+    getName (TyVar _ _ (Just n) _) = n
+    getName (TyVar u _ _        _) = mkLocalName u (showUnique u) True{-emph uniq-} mkUnknownSrcLoc
 \end{code}