X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=d61ce40abf987a9794ccf2b358cedb5b6a8e9f8e;hb=e07fe7df35dbf0880c520cc65dff257ee35c6401;hp=a20ad02558ef0967e9c6f380432c3e0af79320de;hpb=870bb1e805c60dcff9321fcccca000fd6466d31e;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index a20ad02..d61ce40 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -412,14 +412,14 @@ hscExpr dflags hst hit pcs0 this_module expr (pcs1, maybe_renamed_expr) <- renameExpr dflags hit hst pcs0 this_module parsed_expr; case maybe_renamed_expr of - Nothing -> return (pcs1, Nothing) + Nothing -> return ({-WAS:pcs1-} pcs0, Nothing) Just (print_unqual, rn_expr) -> do { -- Typecheck it maybe_tc_return <- typecheckExpr dflags pcs1 hst print_unqual this_module rn_expr; case maybe_tc_return of { - Nothing -> return (pcs1, Nothing); + Nothing -> return ({-WAS:pcs1-} pcs0, Nothing); Just (pcs2, tc_expr, ty) -> do -- if it isn't an IO-typed expression, @@ -515,9 +515,10 @@ initPersistentRenamerState :: IO PersistentRenamerState PRS { prsOrig = NameSupply { nsUniqs = us, nsNames = initOrigNames, nsIPs = emptyFM }, - prsDecls = (emptyNameEnv, 0), - prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0) + prsDecls = (emptyNameEnv, 0), + prsInsts = (emptyBag, 0), + prsRules = (emptyBag, 0), + prsImpMods = emptyFM } )