Commit 844fa868 authored by audreyt@audreyt.org's avatar audreyt@audreyt.org
Browse files

Repair "ghci" under FC+AT by handling AnnCast in bytecode generator.

parent e56b68fa
......@@ -424,6 +424,9 @@ schemeE d s p (AnnCase scrut bndr _ alts)
schemeE d s p (AnnNote note (_, body))
= schemeE d s p body
schemeE d s p (AnnCast (_, body) _)
= schemeE d s p body
schemeE d s p other
= pprPanic "ByteCodeGen.schemeE: unhandled case"
(pprCoreExpr (deAnnotate' other))
......
......@@ -754,7 +754,7 @@ type EqEnv = UniqFM FastString -- Tracks the mapping from L-variables to R-varia
eqIfOcc :: EqEnv -> FastString -> FastString -> IfaceEq
eqIfOcc env n1 n2 = case lookupUFM env n1 of
Just n1 -> bool (n1 == n2)
Nothing -> bool (n1 == n2)
Nothing -> bool (show n1 == show n2)
extendEqEnv :: EqEnv -> FastString -> FastString -> EqEnv
extendEqEnv env n1 n2 | n1 == n2 = env
......
......@@ -563,6 +563,7 @@ missingBootThing thing
= ppr thing <+> ptext SLIT("is defined in the hs-boot file, but not in the module")
bootMisMatch thing boot_decl real_decl
= ppr thing <+> ptext SLIT("has conflicting definitions in the module and its hs-boot file")
$+$ (ppr boot_decl) $+$ (ppr real_decl)
instMisMatch inst
= hang (ppr inst)
2 (ptext SLIT("is defined in the hs-boot file, but not in the module"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment