Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2c7699ac446189ed100a9627bc6fba933097e98f

>---------------------------------------------------------------

commit 2c7699ac446189ed100a9627bc6fba933097e98f
Author: Simon Marlow <[email protected]>
Date:   Wed Nov 2 08:41:08 2011 +0000

    unknownNameSuggestErr: don't panic if we find Ids with UnhelpfulSrcSpans
    
    This happens with the Ids generated by the GHCi debugger for heap
    values (_t1, _t2 etc.).

>---------------------------------------------------------------

 compiler/rename/RnEnv.lhs |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index bcc7d65..261d65a 100644
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -1152,12 +1152,10 @@ unknownNameSuggestErr where_look tried_rdr_name
        ; return extra_err }
   where
     pp_item :: (RdrName, HowInScope) -> SDoc
-    pp_item (rdr, Left loc) = quotes (ppr rdr) <+>   -- Locally defined
-                              parens (ptext (sLit "line") <+> int 
(srcSpanStartLine loc'))
+    pp_item (rdr, Left loc) = quotes (ppr rdr) <+> loc' -- Locally defined
         where loc' = case loc of
-                     UnhelpfulSpan _ ->
-                         panic "unknownNameSuggestErr UnhelpfulSpan"
-                     RealSrcSpan l -> l
+                     UnhelpfulSpan l -> parens (ppr l)
+                     RealSrcSpan l -> parens (ptext (sLit "line") <+> int 
(srcSpanStartLine l))
     pp_item (rdr, Right is) = quotes (ppr rdr) <+>   -- Imported
                               parens (ptext (sLit "imported from") <+> ppr 
(is_mod is))
 



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to