From 90f550a3fe15e7830b5ed350779d7c7289ca5447 Mon Sep 17 00:00:00 2001 From: panne <unknown> Date: Thu, 25 May 2000 12:54:05 +0000 Subject: [PATCH] [project @ 2000-05-25 12:54:05 by panne] Cosmetics: Removed a whole bunch of "Field `foo' is not initialised" warnings. This should not have any impact on efficiency, as GHC inserts `recConError "blah"' expressions for uninitialised fields anyway, and I can't see any danger of space leaks. (can be merged with 4.07) --- ghc/compiler/basicTypes/Var.lhs | 45 +++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/ghc/compiler/basicTypes/Var.lhs b/ghc/compiler/basicTypes/Var.lhs index 30b4affaf29a..63152610e313 100644 --- a/ghc/compiler/basicTypes/Var.lhs +++ b/ghc/compiler/basicTypes/Var.lhs @@ -9,7 +9,6 @@ module Var ( varName, varUnique, varInfo, varType, setVarName, setVarUnique, setVarType, setVarOcc, - -- TyVars TyVar, tyVarName, tyVarKind, @@ -157,9 +156,7 @@ mkTyVar name kind = Var { varName = name , realUnique = getKey (nameUnique name) , varType = kind , varDetails = TyVar -#ifdef DEBUG - , varInfo = pprPanic "looking at IdInfo of a tyvar" (ppr name) -#endif + , varInfo = pprPanic "mkTyVar" (ppr name) } mkSysTyVar :: Unique -> Kind -> TyVar @@ -167,9 +164,7 @@ mkSysTyVar uniq kind = Var { varName = name , realUnique = getKey uniq , varType = kind , varDetails = TyVar -#ifdef DEBUG - , varInfo = pprPanic "mkSysTyVar" (ppr name) -#endif + , varInfo = pprPanic "mkSysTyVar" (ppr name) } where name = mkSysLocalName uniq SLIT("t") @@ -177,18 +172,22 @@ mkSysTyVar uniq kind = Var { varName = name newMutTyVar :: Name -> Kind -> IO TyVar newMutTyVar name kind = do loc <- newIORef Nothing - return (Var { varName = name, - realUnique = getKey (nameUnique name), - varType = kind, - varDetails = MutTyVar loc False}) + return (Var { varName = name + , realUnique = getKey (nameUnique name) + , varType = kind + , varDetails = MutTyVar loc False + , varInfo = pprPanic "newMutTyVar" (ppr name) + }) newSigTyVar :: Name -> Kind -> IO TyVar newSigTyVar name kind = do loc <- newIORef Nothing - return (Var { varName = name, - realUnique = getKey (nameUnique name), - varType = kind, - varDetails = MutTyVar loc True}) + return (Var { varName = name + , realUnique = getKey (nameUnique name) + , varType = kind + , varDetails = MutTyVar loc True + , varInfo = pprPanic "newSigTyVar" (ppr name) + }) readMutTyVar :: TyVar -> IO (Maybe Type) readMutTyVar (Var {varDetails = MutTyVar loc _}) = readIORef loc @@ -227,18 +226,20 @@ type UVar = Var \begin{code} mkUVar :: Unique -> UVar -mkUVar unique = Var { varName = mkSysLocalName unique SLIT("u"), - realUnique = getKey unique, - varDetails = UVar } +mkUVar unique = Var { varName = name + , realUnique = getKey unique + , varDetails = UVar + , varType = pprPanic "mkUVar (varType)" (ppr name) + , varInfo = pprPanic "mkUVar (varInfo)" (ppr name) + } + where name = mkSysLocalName unique SLIT("u") mkNamedUVar :: Name -> UVar mkNamedUVar name = Var { varName = name , realUnique = getKey (nameUnique name) , varDetails = UVar -#ifdef DEBUG - , varType = pprPanic "looking at Type of a uvar" (ppr name) - , varInfo = pprPanic "looking at IdInfo of a uvar" (ppr name) -#endif + , varType = pprPanic "mkNamedUVar (varType)" (ppr name) + , varInfo = pprPanic "mkNamedUVar (varInfo)" (ppr name) } \end{code} -- GitLab