From: simonpj@microsoft.com Date: Wed, 4 Oct 2006 21:10:15 +0000 (+0000) Subject: Comments only X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=52f8fed4a9ca9d23bd86d92c07a3e8d97901a401 Comments only --- diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 03a9692..36413dd 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -670,11 +670,13 @@ mk_known_key_name space mod str uniq Nothing noSrcLoc conName :: Name -> FastString -> Unique -> Name +-- Be careful to ghve constructor names the right parent! conName tycon occ uniq = mkExternalName uniq (nameModule tycon) (mkOccNameFS dataName occ) (Just tycon) noSrcLoc methName :: Name -> FastString -> Unique -> Name +-- Be careful to ghve method names the right parent! methName cls occ uniq = mkExternalName uniq (nameModule cls) (mkVarOccFS occ) (Just cls) noSrcLoc diff --git a/compiler/simplCore/SimplEnv.lhs b/compiler/simplCore/SimplEnv.lhs index 960475c..9bce1e0 100644 --- a/compiler/simplCore/SimplEnv.lhs +++ b/compiler/simplCore/SimplEnv.lhs @@ -308,7 +308,7 @@ substId (SimplEnv { seInScope = in_scope, seIdSubst = ids }) v where -- Get the most up-to-date thing from the in-scope set -- Even though it isn't in the substitution, it may be in - -- the in-scope set better IdInfo + -- the in-scope set with better IdInfo refine v = case lookupInScope in_scope v of Just v' -> v' Nothing -> WARN( True, ppr v ) v -- This is an error!